From 95ed4902e72f979648adfcb0a50ed4be4b531d0b Mon Sep 17 00:00:00 2001 From: sekelsenmat Date: Thu, 17 Apr 2008 00:58:24 +0000 Subject: [PATCH] Just fixes variable initialization and improves identation. git-svn-id: trunk@14852 - --- lcl/interfaces/gtk/gtkwidgetset.inc | 27 +++++++++++++++------------ lcl/interfaces/gtk2/gtk2widgetset.inc | 27 ++++++++++++++++++--------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/lcl/interfaces/gtk/gtkwidgetset.inc b/lcl/interfaces/gtk/gtkwidgetset.inc index 35c08548b9..4c66819bee 100644 --- a/lcl/interfaces/gtk/gtkwidgetset.inc +++ b/lcl/interfaces/gtk/gtkwidgetset.inc @@ -2983,15 +2983,20 @@ var gMouse: PGtkObject; begin //debugln('TGtkWidgetSet.SetCallback A ALCLObject=',DbgSName(ALCLObject),' AMsg=',dbgs(AMsg)); - if Direct then begin - gMain:=AGTKObject; - gCore:=AGTKObject; - gFixed:=AGTKObject; - gMouse:=AGTKObject; - end else begin - if AGTKObject = nil - then gObject := ObjectToGTKObject(ALCLObject) + if Direct then + begin + gMain := AGTKObject; + gCore := AGTKObject; + gFixed := AGTKObject; + gMouse := AGTKObject; + gObject := AGTKObject; + end + else + begin + // gObject + if AGTKObject = nil then gObject := ObjectToGTKObject(ALCLObject) else gObject := AGTKObject; + if gObject = nil then Exit; // gFixed is the widget with the client area (e.g. TGroupBox, TCustomForm have this) @@ -3122,14 +3127,13 @@ begin ConnectSenderSignal(gFixed,'style-set', @GTKStyleChanged); end; + {$IFDEF GTK1} LM_FOCUS : begin - {$IFDEF GTK1} if (ALCLObject is TCustomComboBox) then begin ConnectFocusEvents(PgtkObject(PgtkCombo(gObject)^.entry)); ConnectFocusEvents(PgtkObject(PgtkCombo(gObject)^.list)); end else - {$ENDIF} begin ConnectFocusEvents(gCore); end; @@ -3148,17 +3152,16 @@ begin LM_SYSKEYUP: begin //debugln('TGtkWidgetSet.SetCallback A KEY ALCLObject=',DbgSName(ALCLObject),' AMsg=',dbgs(AMsg)); - {$IFDEF GTK1} if (ALCLObject is TCustomComboBox) then begin ConnectKeyPressReleaseEvents(PgtkObject(PgtkCombo(gObject)^.entry)); end else - {$ENDIF} if (ALCLObject is TCustomForm) then begin ConnectKeyPressReleaseEvents(gObject); end; ConnectKeyPressReleaseEvents(gCore); end; + {$ENDIF} LM_MONTHCHANGED: //calendar Begin diff --git a/lcl/interfaces/gtk2/gtk2widgetset.inc b/lcl/interfaces/gtk2/gtk2widgetset.inc index e5ead83df6..4b6aba205f 100644 --- a/lcl/interfaces/gtk2/gtk2widgetset.inc +++ b/lcl/interfaces/gtk2/gtk2widgetset.inc @@ -327,12 +327,18 @@ var gObject, gFixed, gCore: PGTKObject; begin //debugln('gtk2object.inc TGtkWidgetSet.SetCallback A ALCLObject=',DbgSName(ALCLObject),' AMsg=',dbgs(AMsg)); - if Direct then begin + if Direct then + begin gObject := AGTKObject; gFixed := AGTKObject; gCore := AGTKObject; - end else begin - gObject := AGTKObject; + end + else + begin + // gObject + if AGTKObject = nil then gObject := ObjectToGTKObject(ALCLObject) + else gObject := AGTKObject; + if gObject = nil then Exit; // gFixed is the widget with the client area (e.g. TGroupBox, TForm have this) @@ -349,20 +355,23 @@ begin ConnectFocusEvents(gCore); end; + LM_GRABFOCUS: + begin + ConnectSenderSignal(gObject, 'grab_focus', @gtkActivateCB); + end; + LM_CHAR, LM_KEYDOWN, LM_KEYUP, - LM_SYSCHAR, LM_SYSKEYDOWN, LM_SYSKEYUP: begin - if (ALCLObject is TCustomComboBox) then begin - ConnectKeyPressReleaseEvents(PgtkObject(PgtkCombo(gObject)^.entry)); - end - else if (ALCLObject is TCustomForm) then begin + if (ALCLObject is TCustomComboBox) then + ConnectKeyPressReleaseEvents(PgtkObject(PgtkCombo(gObject)^.entry)) + else if (ALCLObject is TCustomForm) then ConnectKeyPressReleaseEvents(gObject); - end; + ConnectKeyPressReleaseEvents(gCore); end;