fixed focus catch for combobox csDropDownList

git-svn-id: trunk@5890 -

lcl/dbctrls.pp

@@ -264,10 +264,8 @@ Type
     procedure Loaded; override;
     procedure Notification(AComponent: TComponent;
       Operation: TOperation); override;
-
     procedure Click; override;
-
+    procedure EditingDone; override;
-    procedure WMKillFocus(var Message: TLMKillFocus); message LM_KILLFOCUS;
   public
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -343,7 +341,7 @@ Type
     function GetButtonValue(Index: Integer): string;
     procedure UpdateRadioButtonStates; override;
     procedure Loaded; override;
-    procedure WMKillFocus(var Message: TLMKillFocus); message LM_KILLFOCUS;
+    procedure EditingDone; override;
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -397,7 +395,7 @@ Type
     procedure Notification(AComponent: TComponent;
                            Operation: TOperation); override;
     procedure Loaded; override;
-    procedure WMKillFocus(var Message: TLMKillFocus); message LM_KILLFOCUS;
+    procedure EditingDone; override;
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -462,7 +460,7 @@ Type
     procedure UpdateData(Sender: TObject); virtual;
     procedure FocusRequest(Sender: TObject); virtual;
     procedure Loaded; override;
-    procedure WMKillFocus(var Message: TLMKillFocus); message LM_KILLFOCUS;
+    procedure EditingDone; override;
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -480,7 +478,7 @@ Type
     property Enabled;
     property Font;
     property ItemHeight;
-    property Items write SetItems;
+    property Items;
     property ItemWidth;
     property MaxLength default -1;
     property OnChange;
@@ -531,7 +529,7 @@ Type
     procedure UpdateData(Sender: TObject); virtual;
     procedure FocusRequest(Sender: TObject); virtual;
     procedure Loaded; override;
-    procedure WMKillFocus(var Message: TLMKillFocus); message LM_KILLFOCUS;
+    procedure EditingDone; override;
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -690,8 +688,7 @@ Type
     procedure Loaded; override;
     procedure Notification(AComponent: TComponent;
       Operation: TOperation); override;
-
+    procedure EditingDone; override;
-    procedure WMKillFocus(var Message: TLMKillFocus); message LM_KILLFOCUS;
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -1250,6 +1247,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.20  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.19  2004/08/22 22:57:35  mattias
   added OnActiveChange  from Joost
 

lcl/forms.pp

@@ -45,9 +45,9 @@ interface
 {$ENDIF}
 
 uses
-  Classes, SysUtils, LCLStrConsts, LCLType, LCLProc, LCLIntf, InterfaceBase,
+  Classes, SysUtils, Math, LCLStrConsts, LCLType, LCLProc, LCLIntf,
-  LResources, GraphType, Graphics, Menus, LMessages, CustomTimer, ActnList,
+  InterfaceBase, LResources, GraphType, Graphics, Menus, LMessages, CustomTimer,
-  ClipBrd, CustApp, LCLClasses, Controls;
+  ActnList, ClipBrd, CustApp, LCLClasses, Controls;
 
 type
   TProcedure = procedure;
@@ -1163,9 +1163,7 @@ implementation
 
 
 uses
-  WSForms, // Widgetset uses circle is allowed
+  WSForms; // Widgetset uses circle is allowed
-  Buttons,
-  Math;
 
 var
   FocusMessages: Boolean;

lcl/include/customcombobox.inc

@@ -241,9 +241,10 @@ end;
 
   Returns the selected part of text-field.
  ------------------------------------------------------------------------------}
-function TCustomComboBox.GetSelText : string;
+function TCustomComboBox.GetSelText: string;
 begin
-  if FStyle < csDropDownList then
+  debugln('TCustomComboBox.GetSelText ');
+  if FStyle in [csDropDown, csSimple] then
     Result:= Copy(Text, SelStart, SelLength)
   else
     Result:= '';
@@ -256,11 +257,12 @@ end;
 
   Replace the selected part of text-field with "val".
  ------------------------------------------------------------------------------}
-procedure TCustomComboBox.SetSelText(const Val : string);
+procedure TCustomComboBox.SetSelText(const Val: string);
 var
   OldText, NewText: string;
 begin
-  if FStyle < csDropDownList then begin
+  debugln('TCustomComboBox.SetSelText ',Val);
+  if FStyle in [csDropDown, csSimple] then begin
     OldText:=Text;
     NewText:=LeftStr(OldText,SelStart-1)+Val
                +RightStr(OldText,length(OldText)-SelStart-SelLength+1);
@@ -332,10 +334,16 @@ end;
   Select entire text.
  ------------------------------------------------------------------------------}
 procedure TCustomComboBox.SelectAll;
+var
+  CurText: String;
 begin
-  if (FStyle < csDropDownList) and (Text <> '') then begin
+  debugln('TCustomComboBox.SelectAll ');
-    SetSelStart(0);
+  if (FStyle in [csDropDown, csSimple]) then begin
-    SetSelLength(Length(Text));
+    CurText:=Text;
+    if (CurText <> '') then begin
+      SetSelStart(0);
+      SetSelLength(Length(CurText));
+    end;
   end;
 end;
 
@@ -350,7 +358,7 @@ procedure TCustomComboBox.SetStyle(Val : TComboBoxStyle);
 begin
   if Val <> FStyle then begin
     FStyle:= Val;
-    if HandleAllocated and (not (csLoading in ComponentState)) then
+    if HandleAllocated and ([csLoading,csDestroying]*ComponentState=[]) then
       CNSendMessage(LM_SETPROPERTIES, Self, nil);
   end;
 end;
@@ -359,7 +367,7 @@ procedure TCustomComboBox.SetArrowKeysTraverseList(Value : Boolean);
 begin
   if Value <> FArrowKeysTraverseList then begin
     FArrowKeysTraverseList := Value;
-    if HandleAllocated and (not (csLoading in ComponentState)) then
+    if HandleAllocated and ([csLoading,csDestroying]*ComponentState=[]) then
       CNSendMessage(LM_SETPROPERTIES, Self, nil);
    end;
 end;
@@ -399,6 +407,16 @@ begin
       end;
     end;
   end;
+  
+  if Style=csDropDownList then begin
+    debugln('TCustomComboBox.KeyDown ');
+    // DropDownList: allow only navigation keys
+    if not (Key in [VK_UP,VK_DOWN,VK_END,VK_HOME,VK_PRIOR,VK_NEXT,VK_TAB,
+      VK_RETURN])
+    then begin
+      Key:=0;
+    end;
+  end;
 
   if Skip then
     Key := 0
@@ -406,15 +424,6 @@ begin
     inherited KeyDown(Key, Shift);
 end;
 
-procedure TCustomComboBox.KeyPress(var Key : TCharacter);
-begin
-  if (Style=csDropDownList) and (Ord(Key)>31) then
-    Key:=#0
-  else
-    Inherited KeyPress(Key);
-end;
-
-
 {------------------------------------------------------------------------------
   function TCustomComboBox.SelectItem(const AnItem: String): Boolean;
 
@@ -790,6 +799,9 @@ end;
 
 {
   $Log$
+  Revision 1.43  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.42  2004/08/13 16:40:47  mazen
   + TCharater type used to allow UTF8 keyboard with gtk2
 

lcl/include/customform.inc

@@ -174,7 +174,12 @@ Begin
         //if WindowMenu = AComponent then WindowMenu := nil;
         //if ObjectMenuItem = AComponent then ObjectMenuItem := nil;
       end;
-      if FActiveControl=AComponent then FActiveControl:=nil;
+      if FActiveControl=AComponent then begin
+        {$IFDEF VerboseFocus}
+        debugln('TCustomForm.Notification opRemove FActiveControl=',DbgSName(AComponent));
+        {$ENDIF}
+        FActiveControl:=nil;
+      end;
       if AComponent=FDefaultControl then
         FDefaultControl:=nil;
       if AComponent=FCancelControl then
@@ -336,6 +341,7 @@ procedure TCustomForm.SetWindowFocus;
 var
   NewFocusControl: TWinControl;
 begin
+  if [csLoading,csDestroying]*ComponentState<>[] then exit;
   if (FActiveControl <> nil) and (FDesigner = nil) then
     NewFocusControl := FActiveControl
   else
@@ -343,7 +349,7 @@ begin
   {$IFDEF VerboseFocus}
   DebugLn('TCustomForm.SetWindowFocus ',Name,':',Classname ,
     ' NewFocusControl=',NewFocusControl.Name,':',NewFocusControl.ClassName,
-    ' HndAlloc=',NewFocusControl.HandleAllocated);
+    ' HndAlloc=',dbgs(NewFocusControl.HandleAllocated));
   {$ENDIF}
   if (not NewFocusControl.HandleAllocated)
   or (not NewFocusControl.Visible)
@@ -387,9 +393,9 @@ procedure TCustomForm.WMShowWindow(var message: TLMShowWindow);
 
 begin
   {$IFDEF VerboseFocus}
-  DbgOut('TCustomForm.WMShowWindow A ',Name,':',ClassName,' fsShowing=',fsShowing in FFormState,' Msg.Show=',Message.Show);
+  DbgOut('TCustomForm.WMShowWindow A ',Name,':'+ClassName+' fsShowing='+dbgs(fsShowing in FFormState)+' Msg.Show='+dbgs(Message.Show));
   if FActiveControl<>nil then begin
-    DbgOut(' FActiveControl=',FActiveControl.Name,':',FActiveControl.ClassName,' HandleAllocated=',FActiveControl.HandleAllocated);
+    DbgOut(' FActiveControl=',FActiveControl.Name,':',FActiveControl.ClassName,' HandleAllocated=',dbgs(FActiveControl.HandleAllocated));
   end else begin
     DbgOut(' FActiveControl=nil');
   end;
@@ -399,12 +405,17 @@ begin
   Include(FFormState, fsShowing);
   try
     if Message.Show then begin
-      if FActiveControl = nil then
+      if FActiveControl = nil then begin
         FActiveControl := FindFirstControl;
-      if (FActiveControl<>nil) and FActiveControl.HandleAllocated
-      and (FActiveControl.Visible) and (FActiveControl.Enabled) then begin
         {$IFDEF VerboseFocus}
-        DebugLn('TCustomForm.WMShowWindow B ',FActiveControl.Name,':',FActiveControl.ClassName);
+        DebugLn('TCustomForm.WMShowWindow Set FActiveControl := FindFirstControl = ',DbgSName(FActiveControl));
+        {$ENDIF}
+      end;
+      if ([csLoading,csDestroying]*ComponentState=[])
+      and (FActiveControl<>nil) and FActiveControl.HandleAllocated
+      and FActiveControl.Visible and FActiveControl.Enabled then begin
+        {$IFDEF VerboseFocus}
+        DebugLn('TCustomForm.WMShowWindow SetFocus ',DbgSName(FActiveControl));
         {$ENDIF}
         LCLIntf.SetFocus(FActiveControl.Handle);
       end;
@@ -427,7 +438,7 @@ end;
 procedure TCustomForm.WMActivate(var Message : TLMActivate);
 begin
   {$IFDEF VerboseFocus}
-  DebugLn('TCustomForm.WMActivate A ',Name,':',ClassName,' Msg.Active=',Message.Active);
+  DebugLn('TCustomForm.WMActivate A ',Name,':',ClassName,' Msg.Active=',dbgs(Message.Active));
   {$ENDIF}
   if (FormStyle <> fsMDIForm) or (csDesigning in ComponentState) then
     SetActive(Message.Active {<> WA_INACTIVE});
@@ -555,8 +566,12 @@ end;
  ------------------------------------------------------------------------------}
 procedure TCustomForm.DefocusControl(Control: TWinControl; Removing: Boolean);
 begin
-  if Control.ContainsControl(FActiveControl) then
+  if Control.ContainsControl(FActiveControl) then begin
+    {$IFDEF VerboseFocus}
+    debugln('TCustomForm.DefocusControl Control=',DbgSName(Control),' FActiveControl=',DbgSName(FActiveControl));
+    {$ENDIF}
     ActiveControl := nil;
+  end;
 end;
 
 {------------------------------------------------------------------------------
@@ -794,15 +809,20 @@ begin
         if (Msg = LM_SetFocus) and not (csDesigning in ComponentState)
         then begin
           FocusHandle := 0;
+          
           if FormStyle = fsMDIFORM
           then begin
             // ToDo
           end
           else begin
             if (FActiveControl <> nil) and (FActiveControl <> Self)
-            and (FActiveControl.Visible) and (FActiveControl.Enabled)
+            and FActiveControl.Visible and FActiveControl.Enabled
-            then FocusHandle := FActiveControl.Handle;
+            and ([csLoading,csDestroying]*ComponentState=[])
+            then
+              // get or create handle of FActiveControl
+              FocusHandle := FActiveControl.Handle;
           end;
+          
           TheMessage.Result:=0;
           if FocusHandle <> 0
           then begin
@@ -1082,17 +1102,16 @@ Begin
     {$IFDEF VerboseFocus}
     write('TCustomForm.SetActiveControl ',Name,':',ClassName,' FActive=',FActive);
     if FActiveControl<>nil then
-      DebugLn(' OldActiveControl=',FActiveControl.Name,':',FActiveControl.ClassName)
+      DebugLn(' OldActiveControl=',DbgSName(FActiveControl))
     else
       DebugLn(' OldActiveControl=nil');
     if AWinControl<>nil then
-      DebugLn(' NewActiveControl=',AWinControl.Name,':',AWinControl.ClassName)
+      DebugLn(' NewActiveControl=',DbgSName(AWinControl))
     else
       DebugLn(' NewActiveControl=nil');
     {$ENDIF}
     FActiveControl := AWinControl;
-    if not (csLoading in ComponentState) then
+    if ([csLoading,csDestroying]*ComponentState=[]) then begin
-    begin
       if FActive then SetWindowFocus;
       ActiveChanged;
     end;
@@ -1335,6 +1354,8 @@ end;
 
 {------------------------------------------------------------------------------
   TCustomForm Method SetFocusedControl
+  
+  Switch focus.
 ------------------------------------------------------------------------------}
 function TCustomForm.SetFocusedControl(Control: TWinControl): Boolean;
 var
@@ -1350,10 +1371,9 @@ begin
       ParentForm.SetFocusedControl(Control);
     exit;
   end;
-  
 
   // update FActiveControl
-  if FDesigner = nil then
+  if (FDesigner = nil) and (not (csLoading in ComponentState)) then
     if Control <> Self then
       FActiveControl := Control
     else
@@ -1369,8 +1389,8 @@ begin
     Screen.FActiveForm := nil;
 
   {$IFDEF VerboseFocus}
-  DbgOut('TCustomForm.SetFocusedControl Self=',Name,':',ClassName,' ');
+  DbgOut('TCustomForm.SetFocusedControl Self=',DbgSName(Self));
-  DbgOut(' Control=',Control.Name,':',Control.ClassName,' Control.HandleAllocated=',dbgs(Control.HandleAllocated));
+  DbgOut(' Control=',DbgSName(Control),' Control.HandleAllocated=',dbgs(Control.HandleAllocated));
   DebugLn();
   {$ENDIF}
 
@@ -1490,7 +1510,8 @@ begin
   // activate focus if visible
   if Visible then begin
     if (FActiveControl<>nil) and FActiveControl.HandleAllocated
-    and FActiveControl.Visible and FActiveControl.Enabled then begin
+    and FActiveControl.Visible and FActiveControl.Enabled
+    and ([csLoading,csDestroying]*ComponentState=[]) then begin
       {$IFDEF VerboseFocus}
       DebugLn('TCustomForm.CreateWnd A ',FActiveControl.Name,':',FActiveControl.ClassName);
       {$ENDIF}
@@ -1510,6 +1531,9 @@ begin
   if ActiveControl <> nil then
   begin
     Control := ActiveControl;
+    {$IFDEF VerboseFocus}
+    Debugln('TCustomForm.Loaded Self=',DbgSName(Self),' FActiveControl=',DbgSName(FActiveControl));
+    {$ENDIF}
     FActiveControl := nil;
     if Control.CanFocus then SetActiveControl(Control);
   end;
@@ -1784,6 +1808,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.155  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.154  2004/08/27 08:55:22  micha
   implement tapplication.minimize for win32, stub for gtk
 

lcl/include/dbcalendar.inc

@@ -123,13 +123,10 @@ begin
   end;
 end;
 
-procedure TDBCalendar.WMKillFocus(var Message: TLMKillFocus);
+procedure TDBCalendar.EditingDone;
 begin
-  //I am not sure where else to do this :/
-  //we need to make sure the field is updated
-  //if we leave the control after changes
-
   FDataLink.UpdateRecord;
+  inherited EditingDone;
 end;
 
 { Public Methods }
@@ -155,6 +152,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.4  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.3  2004/04/10 17:58:57  mattias
   implemented mainunit hints for include files
 

lcl/include/dbcheckbox.inc

@@ -143,9 +143,10 @@ begin
     DataChange(Self);
 end;
 
-procedure TDBCheckBox.WMKillFocus(var Message: TLMKillFocus);
+procedure TDBCheckBox.EditingDone;
 begin
   FDataLink.UpdateRecord;
+  inherited EditingDone;
 end;
 
 function TDBCheckBox.ValueEqualsField(const AValue, AFieldText: string

lcl/include/dbcombobox.inc

@@ -132,9 +132,10 @@ begin
     DataChange(Self);
 end;
 
-procedure TDBComboBox.WMKillFocus(var Message: TLMKillFocus);
+procedure TDBComboBox.EditingDone;
 begin
   FDataLink.UpdateRecord;
+  inherited EditingDone;
 end;
 
 constructor TDBComboBox.Create(TheOwner: TComponent);

lcl/include/dblistbox.inc

@@ -169,14 +169,10 @@ begin
   FDataLink.Modified;
 end;
 
-
+procedure TDBListBox.EditingDone;
-procedure TDBListBox.WMKillFocus(var Message: TLMKillFocus);
 begin
-  //I am not sure where else to do this :/
-  //we need to make sure the field is updated
-  //if we leave the control after changes
-
   FDataLink.UpdateRecord;
+  inherited EditingDone;
 end;
 
 { Public Methods }
@@ -200,6 +196,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.6  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.5  2004/08/13 16:40:47  mazen
   + TCharater type used to allow UTF8 keyboard with gtk2
 

lcl/include/dbmemo.inc

@@ -140,9 +140,10 @@ begin
     DataChange(Self);
 end;
 
-procedure TDBMemo.WMKillFocus(var Message: TLMKillFocus);
+procedure TDBMemo.EditingDone;
 begin
   FDataLink.UpdateRecord;
+  inherited EditingDone;
 end;
 
 destructor TDBMemo.Destroy;

lcl/include/dbradiogroup.inc

@@ -149,9 +149,10 @@ begin
     DataChange(Self);
 end;
 
-procedure TDBRadioGroup.WMKillFocus(var Message: TLMKillFocus);
+procedure TDBRadioGroup.EditingDone;
 begin
   FDataLink.UpdateRecord;
+  inherited EditingDone;
 end;
 
 constructor TDBRadioGroup.Create(TheOwner: TComponent);

lcl/include/wincontrol.inc

@@ -2015,7 +2015,7 @@ var
   Form : TCustomForm;
 begin
   {$IFDEF VerboseFocus}
-  DebugLn('[TWinControl.SetFocus] ',Name,':',ClassName,' Visible=',Visible,' HandleAllocated=',HandleAllocated);
+  DebugLn('[TWinControl.SetFocus] ',Name,':',ClassName,' Visible=',dbgs(Visible),' HandleAllocated=',dbgs(HandleAllocated));
   {$ENDIF}
   Form := GetParentForm(Self);
   if Form <> nil then
@@ -3827,6 +3827,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.267  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.266  2004/08/26 19:09:34  mattias
   moved navigation key handling to TApplication and added options for custom navigation
 

lcl/interfaces/gtk/gtkobject.inc

@@ -7798,8 +7798,7 @@ begin
   then
     Assert(False, Format('Trace:  [TGtkWidgetSet.SetProperties] %s', [Sender.ClassName]))
   else
-    RaiseException('TGtkWidgetSet.SetProperties: '
+    RaiseException('TGtkWidgetSet.SetProperties: '+DbgSName(Sender));
-                   +' Sender.ClassName='+Sender.ClassName);
 
   wHandle:= Pointer(TWinControl(Sender).Handle);
   Widget:= GTK_WIDGET(wHandle);
@@ -7807,17 +7806,21 @@ begin
   case TControl(Sender).fCompStyle of
   csComboBox:
     begin
+      //debugln('TGtkWidgetSet.SetProperties ',DbgSName(Sender),' ',dbgs(TCustomComboBox(Sender).ArrowKeysTraverseList));
       case TCustomComboBox(Sender).Style of
         csDropDownList :
           begin
-            gtk_combo_set_value_in_list(GTK_COMBO(wHandle),GdkTrue, GdkFalse);
+            // do not set ok_if_empty = true, otherwise it can hang focus
+            gtk_combo_set_value_in_list(GTK_COMBO(wHandle),GdkTrue,GdkTrue);
             gtk_combo_set_use_arrows_always(GTK_COMBO(wHandle),GdkTrue);
             gtk_combo_set_case_sensitive(GTK_COMBO(wHandle),GdkFalse);
           end;
         else
           begin
-            gtk_combo_set_value_in_list(GTK_COMBO(wHandle),GdkFalse,GdkFalse);
+            // do not set ok_if_empty = true, otherwise it can hang focus
+            gtk_combo_set_value_in_list(GTK_COMBO(wHandle),GdkFalse,GdkTrue);
             gtk_combo_set_use_arrows_always(GTK_COMBO(wHandle),GdkFalse);
+            gtk_combo_set_case_sensitive(GTK_COMBO(wHandle),GdkTrue);
           end;
       end;
 
@@ -9251,6 +9254,9 @@ end;
  { =============================================================================
 
   $Log$
+  Revision 1.536  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.535  2004/08/28 10:22:13  mattias
   added hints for long props in OI  from Andrew Haines
 

lcl/interfaces/gtk/gtkproc.inc

@@ -639,6 +639,7 @@ begin
   Result:=HexStr(Cardinal(Widget),8);
   if Widget=nil then exit;
   Result:=Result+'='+GetWidgetClassName(Widget);
+  Result:=Result+' '+WidgetFlagsToString(Widget);
   LCLObject:=GetNearestLCLObject(Widget);
   Result:=Result+' LCLObject='+HexStr(Cardinal(LCLObject),8);
   if LCLObject=nil then exit;
@@ -772,6 +773,8 @@ begin
       Result:=Result+'V';
     if GTK_WIDGET_DRAWABLE(Widget) then
       Result:=Result+'D';
+    if GTK_WIDGET_CAN_FOCUS(Widget) then
+      Result:=Result+'F';
   end;
   Result:=Result+']';
 end;
@@ -7187,6 +7190,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.297  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.296  2004/08/29 10:13:59  mattias
   fixed makefile
 

lcl/interfaces/gtk/gtkwinapi.inc

@@ -7718,12 +7718,8 @@ begin
   Widget:=PGtkWidget(hWnd);
   {$IfDef VerboseFocus}
   DebugLn('');
-  write('[TGtkWidgetSet.SetFocus] A hWnd=',HexStr(Cardinal(hWnd),8));
+  write('[TGtkWidgetSet.SetFocus] A hWnd=',GetWidgetDebugReport(Widget));
   LCLObject:=TWinControl(GetLCLObject(Widget));
-  if LCLObject<>nil then
-    DebugLn(' LCLObject=',LCLObject.Name,':',LCLObject.ClassName)
-  else
-    DebugLn(' LCLObject=nil');
   {$EndIf}
   if hwnd = 0 then begin
     Result:=0;
@@ -7736,22 +7732,15 @@ begin
 
   TopLevel := gtk_widget_get_toplevel(Widget);
   {$IfDef VerboseFocus}
-  DbgOut('[TGtkWidgetSet.SetFocus] B hWnd=',HexStr(Cardinal(hWnd),8));
+  Debugln('[TGtkWidgetSet.SetFocus] B');
-  DbgOut(' HndVisible=',GTK_WIDGET_VISIBLE(Widget));
+  DbgOut('   TopLevel=',HexStr(Cardinal(TopLevel),8));
-  DbgOut(' HndRealized=',GTK_WIDGET_REALIZED(Widget));
+  DbgOut(' OldFocus=',GetWidgetDebugReport(PGtkWidget(Result)));
-  DbgOut(' HndMapped=',GTK_WIDGET_MAPPED(Widget));
-  DebugLn(''); DbgOut('   ');
-  DbgOut(' TopLevel=',HexStr(Cardinal(TopLevel),8));
-  DbgOut(' OldFocus=',HexStr(Cardinal(Result),8));
-  AWinControl:=TWinControl(GetNearestLCLObject(PGtkWidget(Result)));
-  if AWinControl<>nil then
-    DbgOut(' OldLCLParent=',AWinControl.Name,':',AWinControl.ClassName)
-  else
-    DbgOut(' OldLCLParent=nil');
   DebugLn('');
   if not GTK_WIDGET_VISIBLE(Widget) then
     RaiseException('TGtkWidgetSet.SetFocus: Widget is not visible');
   {$EndIf}
+  
+  if Result=hWnd then exit;
 
   if GtkWidgetIsA(TopLevel, gtk_window_get_type)
   then begin
@@ -7811,7 +7800,7 @@ begin
         {$EndIf}
         gtk_window_set_focus(PGtkWindow(TopLevel),NewFocusWidget);
         {$IfDef VerboseFocus}
-        DebugLn('  I NewTopLevel FocusWidget=',HexStr(Cardinal(PGtkWindow(TopLevel)^.Focus_Widget),8),' Success=',PGtkWindow(TopLevel)^.Focus_Widget=NewFocusWidget);
+        DebugLn('  I NewTopLevel FocusWidget=',HexStr(Cardinal(PGtkWindow(TopLevel)^.Focus_Widget),8),' Success=',dbgs(PGtkWindow(TopLevel)^.Focus_Widget=NewFocusWidget));
         {$EndIf}
       end;
     end;
@@ -8729,6 +8718,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.363  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.362  2004/08/19 18:50:53  mattias
   splitted IDE component owner hierachy to reduce notification time
 

lcl/interfaces/gtk/gtkwinapiwindow.pp

@@ -533,7 +533,7 @@ function GTKAPIWidgetClient_FocusIn(AWidget: PGTKWidget;
   Event: PGdkEventFocus): GTKEventResult; cdecl;
 begin
   {$IFDEF VerboseFocus}
-  DebugLn('GTKAPIWidgetClient_FocusIn ',HexStr(Cardinal(AWidget),8),' ',event^.thein);
+  DebugLn('GTKAPIWidgetClient_FocusIn ',HexStr(Cardinal(AWidget),8),' ',dbgs(event^.thein));
   {$ENDIF}
   
   gtk_widget_set_flags(AWidget, GTK_HAS_FOCUS);
@@ -551,7 +551,7 @@ function GTKAPIWidgetClient_FocusOut(AWidget: PGTKWidget;
   Event: PGdkEventFocus): GTKEventResult; cdecl;
 begin
   {$IFDEF VerboseFocus}
-  DebugLn('GTKAPIWidgetClient_FocusOut ',HexStr(Cardinal(AWidget),8),' ',event^.thein);
+  DebugLn('GTKAPIWidgetClient_FocusOut ',HexStr(Cardinal(AWidget),8),' ',dbgs(event^.thein));
   {$ENDIF}
   
   gtk_widget_unset_flags(AWidget, GTK_HAS_FOCUS);
@@ -1110,6 +1110,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.64  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.63  2004/08/28 10:22:13  mattias
   added hints for long props in OI  from Andrew Haines
 

lcl/lclproc.pas

@@ -129,6 +129,16 @@ procedure DebugLn(const s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12,s13,s14,s15,s16:
 
 procedure DbgOut(const s: string);
 procedure DbgOut(const s1,s2: string);
+procedure DbgOut(const s1,s2,s3: string);
+procedure DbgOut(const s1,s2,s3,s4: string);
+procedure DbgOut(const s1,s2,s3,s4,s5: string);
+procedure DbgOut(const s1,s2,s3,s4,s5,s6: string);
+procedure DbgOut(const s1,s2,s3,s4,s5,s6,s7: string);
+procedure DbgOut(const s1,s2,s3,s4,s5,s6,s7,s8: string);
+procedure DbgOut(const s1,s2,s3,s4,s5,s6,s7,s8,s9: string);
+procedure DbgOut(const s1,s2,s3,s4,s5,s6,s7,s8,s9,s10: string);
+procedure DbgOut(const s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11: string);
+procedure DbgOut(const s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12: string);
 
 function DbgS(const c: cardinal): string;
 function DbgS(const i: integer): string;
@@ -137,7 +147,7 @@ function DbgS(const p: TPoint): string;
 function DbgS(const p: pointer): string;
 function DbgS(const e: extended): string;
 function DbgS(const b: boolean): string;
-function DbgSName(const p: TPersistent): string;
+function DbgSName(const p: TObject): string;
 
 function DbgS(const i1,i2,i3,i4: integer): string;
 
@@ -800,6 +810,57 @@ begin
   DbgOut(s1+s2);
 end;
 
+procedure DbgOut(const s1, s2, s3: string);
+begin
+  DbgOut(s1+s2+s3);
+end;
+
+procedure DbgOut(const s1, s2, s3, s4: string);
+begin
+  DbgOut(s1+s2+s3+s4);
+end;
+
+procedure DbgOut(const s1, s2, s3, s4, s5: string);
+begin
+  DbgOut(s1+s2+s3+s4+s5);
+end;
+
+procedure DbgOut(const s1, s2, s3, s4, s5, s6: string);
+begin
+  DbgOut(s1+s2+s3+s4+s5+s6);
+end;
+
+procedure DbgOut(const s1, s2, s3, s4, s5, s6, s7: string);
+begin
+  DbgOut(s1+s2+s3+s4+s5+s6+s7);
+end;
+
+procedure DbgOut(const s1, s2, s3, s4, s5, s6, s7, s8: string);
+begin
+  DbgOut(s1+s2+s3+s4+s5+s6+s7+s8);
+end;
+
+procedure DbgOut(const s1, s2, s3, s4, s5, s6, s7, s8, s9: string);
+begin
+  DbgOut(s1+s2+s3+s4+s5+s6+s7+s8+s9);
+end;
+
+procedure DbgOut(const s1, s2, s3, s4, s5, s6, s7, s8, s9, s10: string);
+begin
+  DbgOut(s1+s2+s3+s4+s5+s6+s7+s8+s9+s10);
+end;
+
+procedure DbgOut(const s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11: string);
+begin
+  DbgOut(s1+s2+s3+s4+s5+s6+s7+s8+s9+s10+s11);
+end;
+
+procedure DbgOut(const s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12: string
+  );
+begin
+  DbgOut(s1+s2+s3+s4+s5+s6+s7+s8+s9+s10+s11+s12);
+end;
+
 function DbgS(const c: cardinal): string;
 begin
   Result:=IntToStr(c);
@@ -836,7 +897,7 @@ begin
   if b then Result:='True' else Result:='False';
 end;
 
-function DbgSName(const p: TPersistent): string;
+function DbgSName(const p: TObject): string;
 begin
   if p=nil then
     Result:='nil'

lcl/stdctrls.pp

@@ -262,7 +262,6 @@ type
     procedure SetSorted(Val : boolean); virtual;
     procedure SetStyle(Val : TComboBoxStyle); virtual;
     procedure KeyDown(var Key : Word; Shift : TShiftState); override;
-    procedure KeyPress(var Key : TCharacter); override;
 
     property DropDownCount: Integer read FDropDownCount write SetDropDownCount default 8;
     property Items: TStrings read FItems write SetItems;
@@ -1172,6 +1171,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.164  2004/08/30 10:49:20  mattias
+  fixed focus catch for combobox csDropDownList
+
   Revision 1.163  2004/08/26 19:09:33  mattias
   moved navigation key handling to TApplication and added options for custom navigation