From ab5868d740db6e1ac43bbde6f56023ca9031296f Mon Sep 17 00:00:00 2001
From: lazarus <lazarus@lazarus-ide.org>
Date: Wed, 31 Jan 2001 21:16:45 +0000
Subject: [PATCH] Changed to TCOmboBox focusing. Shane

git-svn-id: trunk@160 -
---
 ide/uniteditor.pp                  |  7 +++++++
 lcl/graphics.pp                    |  8 ++++++--
 lcl/interfaces/gtk/gtkcallback.inc |  6 ++++++
 lcl/interfaces/gtk/gtkobject.inc   | 18 ++++++++++++++++--
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp
index 522eb19051..cf8fdadeab 100644
--- a/ide/uniteditor.pp
+++ b/ide/uniteditor.pp
@@ -269,6 +269,8 @@ const
   ecOpen    = ecFirstParent+2;
   ecClose    = ecFirstParent+3;
 
+  ecJumpToEditor = ecFirstParent+4;
+
 var
 Editor_Num : Integer;
 aHighlighter: TSynPasSyn;
@@ -831,6 +833,7 @@ if assigned(FEditor) then
     AddKey(ecSave, word('S'), [ssCtrl], 0, []);
     AddKey(ecOpen, word('O'), [ssCtrl], 0, []);
     AddKey(ecClose, VK_F4, [ssCtrl], 0, []);
+
     OnStatusChange := @EditorStatusChanged;
     OnProcessUserCommand := @ProcessUserCommand;
     Show;
@@ -1782,6 +1785,10 @@ begin
               writeln('CloseClicked being called');
               CloseClicked(self);
             end;
+
+   ecJumpToEditor : Begin
+                      //This is NOT implemented yet
+                    end;
    end;  //case
 end;
 
diff --git a/lcl/graphics.pp b/lcl/graphics.pp
index 21e514bf09..9071e54d57 100644
--- a/lcl/graphics.pp
+++ b/lcl/graphics.pp
@@ -130,8 +130,8 @@ type
     Pitch : TFontPitch;
     Style : TFontStylesBase;
     CharSet : TFontCharSet;
-  	Name : TFontDataName;
-	end;
+    Name : TFontDataName;
+  end;
 
   TPenStyle = (psSolid, psDash, psDot, psDashDot, psDashDotDot, psClear, psInsideframe);
   TPenMode = (pmBlack, pmWhite, pmNop, pmNot, pmCopy, pmNotCopy, pmMergePenNot,
@@ -511,6 +511,10 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.3  2001/01/31 21:16:45  lazarus
+  Changed to TCOmboBox focusing.
+  Shane
+
   Revision 1.2  2000/08/10 18:56:23  lazarus
   Added some winapi calls.
   Most don't have code yet.
diff --git a/lcl/interfaces/gtk/gtkcallback.inc b/lcl/interfaces/gtk/gtkcallback.inc
index 4aa9d642f5..90f54d16ed 100644
--- a/lcl/interfaces/gtk/gtkcallback.inc
+++ b/lcl/interfaces/gtk/gtkcallback.inc
@@ -255,6 +255,7 @@ var
    Mess : TLMessage;
 begin
    EventTrace('focus', data);
+   Writeln('Getting Focus...');
    //TODO: fill in old focus
    Mess.msg := LM_SETFOCUS;
    Assert(False, Format('Trace:TODO: [gtkfocusCB] %s  finish', [TObject(Data).ClassName]));
@@ -266,6 +267,7 @@ var
    Mess : TLMessage;
 begin
    EventTrace('killfocus', data);
+   Writeln('KIlling Focus...');
    Mess.msg := LM_KILLFOCUS;
    //TODO: fill in new focus
    Assert(False, Format('Trace:TODO: [gtkkillfocusCB] %s  finish', [TObject(Data).ClassName]));
@@ -1075,6 +1077,10 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.21  2001/01/31 21:16:45  lazarus
+  Changed to TCOmboBox focusing.
+  Shane
+
   Revision 1.20  2001/01/30 18:15:02  lazarus
   Added code for TStatusBar
   I'm now capturing WMPainT and doing the drawing myself.
diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc
index 877f5aefca..60d79fe936 100644
--- a/lcl/interfaces/gtk/gtkobject.inc
+++ b/lcl/interfaces/gtk/gtkobject.inc
@@ -1243,8 +1243,18 @@ begin
     LM_FOCUS :
     begin
       //ConnectSignal(gObject, 'focus', @gtkfocusCB);
-      ConnectSignal(gObject, 'focus-in-event', @gtkFocusCB);
-      ConnectSignal(gObject, 'focus-out-event', @gtkKillFocusCB);
+      if (sender is TCustomComboBox) then
+         Begin
+          ConnectSignal(PgtkObject(PgtkCombo(TCustomComboBox(sender).handle)^.entry), 'focus-in-event', @gtkFocusCB);
+          ConnectSignal(PgtkObject(PgtkCombo(TCustomComboBox(sender).handle)^.entry), 'focus-out-event', @gtkKillFocusCB);
+          ConnectSignal(PgtkObject(PgtkCombo(TCustomComboBox(sender).handle)^.list), 'focus-in-event', @gtkFocusCB);
+          ConnectSignal(PgtkObject(PgtkCombo(TCustomComboBox(sender).handle)^.list), 'focus-out-event', @gtkKillFocusCB);
+         end
+         else
+         Begin
+          ConnectSignal(gObject, 'focus-in-event', @gtkFocusCB);
+          ConnectSignal(gObject, 'focus-out-event', @gtkKillFocusCB);
+         end;
     end;
 
     LM_KEYDOWN,
@@ -2596,6 +2606,10 @@ end;
  { =============================================================================
 
   $Log$
+  Revision 1.24  2001/01/31 21:16:45  lazarus
+  Changed to TCOmboBox focusing.
+  Shane
+
   Revision 1.23  2001/01/28 21:06:07  lazarus
   Changes for TComboBox events KeyPress Focus.
   Shane