fixed PerformTab call

git-svn-id: trunk@4619 -
This commit is contained in:
mattias 2003-09-13 16:43:01 +00:00
parent 4196d41aae
commit 6c84448ce9
2 changed files with 10 additions and 3 deletions

View File

@ -1055,7 +1055,7 @@ begin
If List.Count > 0 then begin If List.Count > 0 then begin
J := List.IndexOf(CurrentControl); J := List.IndexOf(CurrentControl);
if J<0 then exit; if J<0 then exit;
//writeln('TWinControl.FindNextControl A ',CurrentControl.Name,' ',J); //writeln('TWinControl.FindNextControl A ',CurrentControl.Name,' ',J,' ',GoForward,',',CheckTabStop,',',CheckParent,',',OnlyWinControls);
I := J; I := J;
Repeat Repeat
If GoForward then begin If GoForward then begin
@ -1070,13 +1070,14 @@ begin
if I=J then exit; if I=J then exit;
Next := TControl(List[I]); Next := TControl(List[I]);
//writeln('TWinControl.FindNextControl B ',Next.Name,' ',I);
If (((Not CheckTabStop) or Next.TabStop) If (((Not CheckTabStop) or Next.TabStop)
and ((not CheckParent) or (Next.Parent = Self))) and ((not CheckParent) or (Next.Parent = Self)))
and (Next.Enabled and Next.Visible) and (Next.Enabled and Next.Visible)
and ((not OnlyWinControls) or (Next is TWinControl)) then and ((not OnlyWinControls) or (Next is TWinControl)) then
Result := Next; Result := Next;
until (Result <> nil); until (Result <> nil);
//writeln('TWinControl.FindNextControl B ',Result.Name,' ',I); //writeln('TWinControl.FindNextControl END ',Result.Name,' ',I);
end; end;
finally finally
List.Free; List.Free;
@ -3078,6 +3079,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.168 2003/09/13 16:43:01 mattias
fixed PerformTab call
Revision 1.167 2003/09/13 14:01:39 mattias Revision 1.167 2003/09/13 14:01:39 mattias
fixed taborder dlg fixed taborder dlg

View File

@ -639,7 +639,7 @@ begin
and (PGtkWindow(TopLevel)^.focus_widget=Widget) then begin and (PGtkWindow(TopLevel)^.focus_widget=Widget) then begin
StopKeyEvent('key_press_event'); StopKeyEvent('key_press_event');
//writeln('GTKKeyUpDown ',TControl(Data).Name,':',TControl(Data).ClassName); //writeln('GTKKeyUpDown ',TControl(Data).Name,':',TControl(Data).ClassName);
{$Ifdef GTk1}result:={$EndIf}TControl(Data).PerformTab(ssShift in ShiftState); {$Ifdef GTk1}Result:={$EndIf}TControl(Data).PerformTab(not (ssShift in ShiftState));
If Result then begin If Result then begin
{$IfNDef Win32} {$IfNDef Win32}
{$ifdef GTK2} {$ifdef GTK2}
@ -2847,6 +2847,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.190 2003/09/13 16:43:01 mattias
fixed PerformTab call
Revision 1.189 2003/09/12 17:40:45 ajgenius Revision 1.189 2003/09/12 17:40:45 ajgenius
fixes for GTK2(accel groups, menu accel, 'draw'), fixes for GTK2(accel groups, menu accel, 'draw'),
more work toward Pango(DrawText now works, UpdateDCTextMetric mostly works) more work toward Pango(DrawText now works, UpdateDCTextMetric mostly works)