diff --git a/images/components/tdbgrid.xpm b/images/components/tdbgrid.xpm index 9608770115..b3d2a2349d 100644 --- a/images/components/tdbgrid.xpm +++ b/images/components/tdbgrid.xpm @@ -1,32 +1,31 @@ /* XPM */ static char * tdbgrid_xpm[] = { -"23 23 6 1", +"23 23 5 1", " c None", -". c #A0978F", -"+ c #7F7F7F", -"@ c #BFBFBF", -"# c #FFFFFF", -"$ c #000000", -".......................", -".+++++++++++++++.......", -".+@+#@@@@#@@@@@+.......", -".+++++++++++++++.......", -".+@+####@######+.......", -".+#+#@@#@#@@@@#+.......", -".+@+####@######+.......", -".+#+#@@#@#@@@##+.......", -".+@+####@######+.......", -".+#+$$$$$$$$$$$$$$$$$$.", -".+@+$@$#@@@@@#@@@@@@@$.", -".+++$$$$$$$$$$$$$$$$$$.", -"....$@$#####@########$.", -"....$#$@@@@@@@@@@@@@@$.", -"....$@$#####@########$.", -"....$#$@@@@@@@@@@@@@@$.", -"....$@$#####@########$.", -"....$#$@@@@@@@@@@@@@@$.", -"....$@$#####@########$.", -"....$#$@@@@@@@@@@@@@@$.", -"....$@$#####@########$.", -"....$$$$$$$$$$$$$$$$$$.", -"......................."}; +". c #7F7F7F", +"+ c #BFBFBF", +"@ c #FFFFFF", +"# c #000000", +" ", +" ............... ", +" .+.@++++@+++++. ", +" ............... ", +" .+.@@@@+@@@@@@. ", +" .@.@++@+@++++@. ", +" .+.@@@@+@@@@@@. ", +" .@.@++@+@+++@@. ", +" .+.@@@@+@@@@@@. ", +" .@.################## ", +" .+.#+#@+++++@+++++++# ", +" ...################## ", +" #+#@@@@@+@@@@@@@@# ", +" #@#++++++++++++++# ", +" #+#@@@@@+@@@@@@@@# ", +" #@#++++++++++++++# ", +" #+#@@@@@+@@@@@@@@# ", +" #@#++++++++++++++# ", +" #+#@@@@@+@@@@@@@@# ", +" #@#++++++++++++++# ", +" #+#@@@@@+@@@@@@@@# ", +" ################## ", +" "}; diff --git a/images/components/tdrawgrid.xpm b/images/components/tdrawgrid.xpm index e072eb525f..36acf9ff05 100644 --- a/images/components/tdrawgrid.xpm +++ b/images/components/tdrawgrid.xpm @@ -2,31 +2,31 @@ static char * tdrawgrid_xpm[] = { "23 23 6 1", " c None", -". c #C0C0C0", -"+ c #000000", +". c #000000", +"+ c #C0C0C0", "@ c #FFFFFF", "# c #909090", "$ c #000080", -".......................", -".++++++++++++++++++....", -".+.+@.....@.......+#...", -".++++++++++++++++++#...", -".+.+@@@@@.@@@@@@@@+#...", -".+@+@$$$@.@$$$$$$@+#...", -".+.+@@@@@.@@@@@@@@+#...", -".+@+@$$$@.@$$$$$@@+#...", -".+.+@@@@@.@@@@@@@@+#...", -".+@+@$$$@.@$$$$$$@+#...", -".+.+@@@@@.@@@@@@@@+#...", -".++++++++++++++++++#...", -"..############+#####...", -".............#+#.......", -".............+@+.......", -"............#+@+#......", -"............+@@@+#++++.", -"..........++++@@+@.@.+.", -".........+$$$$+@@+@.@+.", -".........+$$$$++++.@.+.", -".........+$$$$+.+.@.@+.", -".........+$$$$+.++++++.", -"..........++++........."}; +" ", +" .................. ", +" .+.@+++++@+++++++.# ", +" ..................# ", +" .+.@@@@@+@@@@@@@@.# ", +" .@.@$$$@+@$$$$$$@.# ", +" .+.@@@@@+@@@@@@@@.# ", +" .@.@$$$@+@$$$$$@@.# ", +" .+.@@@@@+@@@@@@@@.# ", +" .@.@$$$@+@$$$$$$@.# ", +" .+.@@@@@+@@@@@@@@.# ", +" ..................# ", +" ############.##### ", +" #.# ", +" .@. ", +" #.@.# ", +" .@@@.#.... ", +" ....@@.@+@+. ", +" .$$$$.@@.@+@. ", +" .$$$$....+@+. ", +" .$$$$. .+@+@. ", +" .$$$$. ...... ", +" .... "}; diff --git a/images/components/tstringgrid.xpm b/images/components/tstringgrid.xpm index 232dad4389..72a59a0437 100644 --- a/images/components/tstringgrid.xpm +++ b/images/components/tstringgrid.xpm @@ -2,30 +2,30 @@ static char * tstringgrid_xpm[] = { "23 23 5 1", " c None", -". c #C0C0C0", -"+ c #000000", +". c #000000", +"+ c #C0C0C0", "@ c #FFFFFF", "# c #000080", -".......................", -".++++++++++++++++++....", -".+.+@.....@.......+....", -".++++++++++++++++++....", -".+.+@@@@@.@@@@@@@@+....", -".+@+@###@.@######@+....", -".+.+@@@@@.@@@@@@@@+....", -".+@+@###@.@#####@@+....", -".+.+@@@@@.@@@@@@@@+....", -".+@+@###@.@######@+....", -".+.+@@@@@.@@@@@@@@+....", -".+@+@###@.@#####@@+....", -".+.+@@@@@.@@@@@@@@+....", -".++++++++++++++++++....", -".............#.........", -".............#.........", -".........##..###...##..", -"...........#.#..#.#..#.", -".........###.#..#.#....", -"........#..#.#..#.#....", -"........#..#.#..#.#..#.", -".........###.###...##..", -"......................."}; +" ", +" .................. ", +" .+.@+++++@+++++++. ", +" .................. ", +" .+.@@@@@+@@@@@@@@. ", +" .@.@###@+@######@. ", +" .+.@@@@@+@@@@@@@@. ", +" .@.@###@+@#####@@. ", +" .+.@@@@@+@@@@@@@@. ", +" .@.@###@+@######@. ", +" .+.@@@@@+@@@@@@@@. ", +" .@.@###@+@#####@@. ", +" .+.@@@@@+@@@@@@@@. ", +" .................. ", +" # ", +" # ", +" ## ### ## ", +" # # # # # ", +" ### # # # ", +" # # # # # ", +" # # # # # # ", +" ### ### ## ", +" "}; diff --git a/images/components_images.lrs b/images/components_images.lrs index d87166e815..5da5fae89c 100644 --- a/images/components_images.lrs +++ b/images/components_images.lrs @@ -640,19 +640,18 @@ LazarusResources.Add('tdbedit','XPM',[ +'q m.+ + + } "};'#10 ]); LazarusResources.Add('tdbgrid','XPM',[ - '/* XPM */'#10'static char * tdbgrid_xpm[] = {'#10'"23 23 6 1",'#10'" '#9'c N' - +'one",'#10'".'#9'c #A0978F",'#10'"+'#9'c #7F7F7F",'#10'"@'#9'c #BFBFBF",'#10 - +'"#'#9'c #FFFFFF",'#10'"$'#9'c #000000",'#10'".......................",'#10 - +'".+++++++++++++++.......",'#10'".+@+#@@@@#@@@@@+.......",'#10'".+++++++++++' - +'++++.......",'#10'".+@+####@######+.......",'#10'".+#+#@@#@#@@@@#+.......",' - +#10'".+@+####@######+.......",'#10'".+#+#@@#@#@@@##+.......",'#10'".+@+####@' - +'######+.......",'#10'".+#+$$$$$$$$$$$$$$$$$$.",'#10'".+@+$@$#@@@@@#@@@@@@@$' - +'.",'#10'".+++$$$$$$$$$$$$$$$$$$.",'#10'"....$@$#####@########$.",'#10'"....' - +'$#$@@@@@@@@@@@@@@$.",'#10'"....$@$#####@########$.",'#10'"....$#$@@@@@@@@@@' - +'@@@@$.",'#10'"....$@$#####@########$.",'#10'"....$#$@@@@@@@@@@@@@@$.",'#10 - +'"....$@$#####@########$.",'#10'"....$#$@@@@@@@@@@@@@@$.",'#10'"....$@$#####' - +'@########$.",'#10'"....$$$$$$$$$$$$$$$$$$.",'#10'"......................."}' - +';'#10 + '/* XPM */'#10'static char * tdbgrid_xpm[] = {'#10'"23 23 5 1",'#10'" '#9'c N' + +'one",'#10'".'#9'c #7F7F7F",'#10'"+'#9'c #BFBFBF",'#10'"@'#9'c #FFFFFF",'#10 + +'"#'#9'c #000000",'#10'" ",'#10'" ............... ' + +' ",'#10'" .+.@++++@+++++. ",'#10'" ............... ",'#10'" .+' + +'.@@@@+@@@@@@. ",'#10'" .@.@++@+@++++@. ",'#10'" .+.@@@@+@@@@@@.' + +' ",'#10'" .@.@++@+@+++@@. ",'#10'" .+.@@@@+@@@@@@. ",'#10 + +'" .@.################## ",'#10'" .+.#+#@+++++@+++++++# ",'#10'" ...########' + +'########## ",'#10'" #+#@@@@@+@@@@@@@@# ",'#10'" #@#++++++++++++++# ",' + +#10'" #+#@@@@@+@@@@@@@@# ",'#10'" #@#++++++++++++++# ",'#10'" #+#@@' + +'@@@+@@@@@@@@# ",'#10'" #@#++++++++++++++# ",'#10'" #+#@@@@@+@@@@@@@@#' + +' ",'#10'" #@#++++++++++++++# ",'#10'" #+#@@@@@+@@@@@@@@# ",'#10'" ' + +'################## ",'#10'" "};'#10 ]); LazarusResources.Add('tdbgroupbox','XPM',[ '/* XPM */'#10'static char * tdbgroupbox_xpm[] = {'#10'"23 23 7 1",'#10'" '#9 @@ -896,18 +895,18 @@ LazarusResources.Add('tdbtext','XPM',[ ]); LazarusResources.Add('tdrawgrid','XPM',[ '/* XPM */'#10'static char * tdrawgrid_xpm[] = {'#10'"23 23 6 1",'#10'" '#9'c' - +' None",'#10'".'#9'c #C0C0C0",'#10'"+'#9'c #000000",'#10'"@'#9'c #FFFFFF",' - +#10'"#'#9'c #909090",'#10'"$'#9'c #000080",'#10'".......................",' - +#10'".++++++++++++++++++....",'#10'".+.+@.....@.......+#...",'#10'".++++++++' - +'++++++++++#...",'#10'".+.+@@@@@.@@@@@@@@+#...",'#10'".+@+@$$$@.@$$$$$$@+#..' - +'.",'#10'".+.+@@@@@.@@@@@@@@+#...",'#10'".+@+@$$$@.@$$$$$@@+#...",'#10'".+.+' - +'@@@@@.@@@@@@@@+#...",'#10'".+@+@$$$@.@$$$$$$@+#...",'#10'".+.+@@@@@.@@@@@@@' - +'@+#...",'#10'".++++++++++++++++++#...",'#10'"..############+#####...",'#10 - +'".............#+#.......",'#10'".............+@+.......",'#10'"............' - +'#+@+#......",'#10'"............+@@@+#++++.",'#10'"..........++++@@+@.@.+.",' - +#10'".........+$$$$+@@+@.@+.",'#10'".........+$$$$++++.@.+.",'#10'".........' - +'+$$$$+.+.@.@+.",'#10'".........+$$$$+.++++++.",'#10'"..........++++........' - +'."};'#10 + +' None",'#10'".'#9'c #000000",'#10'"+'#9'c #C0C0C0",'#10'"@'#9'c #FFFFFF",' + +#10'"#'#9'c #909090",'#10'"$'#9'c #000080",'#10'" ",' + +#10'" .................. ",'#10'" .+.@+++++@+++++++.# ",'#10'" ........' + +'..........# ",'#10'" .+.@@@@@+@@@@@@@@.# ",'#10'" .@.@$$$@+@$$$$$$@.# ' + +' ",'#10'" .+.@@@@@+@@@@@@@@.# ",'#10'" .@.@$$$@+@$$$$$@@.# ",'#10'" .+.' + +'@@@@@+@@@@@@@@.# ",'#10'" .@.@$$$@+@$$$$$$@.# ",'#10'" .+.@@@@@+@@@@@@@' + +'@.# ",'#10'" ..................# ",'#10'" ############.##### ",'#10 + +'" #.# ",'#10'" .@. ",'#10'" ' + +'#.@.# ",'#10'" .@@@.#.... ",'#10'" ....@@.@+@+. ",' + +#10'" .$$$$.@@.@+@. ",'#10'" .$$$$....+@+. ",'#10'" ' + +'.$$$$. .+@+@. ",'#10'" .$$$$. ...... ",'#10'" .... ' + +' "};'#10 ]); LazarusResources.Add('tedit','XPM',[ '/* XPM */'#10'static char * tedit_xpm[] = {'#10'"23 16 157 2",'#10'" '#9'c ' @@ -2113,17 +2112,17 @@ LazarusResources.Add('tstatusbar','XPM',[ ]); LazarusResources.Add('tstringgrid','XPM',[ '/* XPM */'#10'static char * tstringgrid_xpm[] = {'#10'"23 23 5 1",'#10'" '#9 - +'c None",'#10'".'#9'c #C0C0C0",'#10'"+'#9'c #000000",'#10'"@'#9'c #FFFFFF",' - +#10'"#'#9'c #000080",'#10'".......................",'#10'".+++++++++++++++++' - +'+....",'#10'".+.+@.....@.......+....",'#10'".++++++++++++++++++....",'#10'"' - +'.+.+@@@@@.@@@@@@@@+....",'#10'".+@+@###@.@######@+....",'#10'".+.+@@@@@.@@@' - +'@@@@@+....",'#10'".+@+@###@.@#####@@+....",'#10'".+.+@@@@@.@@@@@@@@+....",' - +#10'".+@+@###@.@######@+....",'#10'".+.+@@@@@.@@@@@@@@+....",'#10'".+@+@###@' - +'.@#####@@+....",'#10'".+.+@@@@@.@@@@@@@@+....",'#10'".++++++++++++++++++...' - +'.",'#10'".............#.........",'#10'".............#.........",'#10'"....' - +'.....##..###...##..",'#10'"...........#.#..#.#..#.",'#10'".........###.#..#' - +'.#....",'#10'"........#..#.#..#.#....",'#10'"........#..#.#..#.#..#.",'#10 - +'".........###.###...##..",'#10'"......................."};'#10 + +'c None",'#10'".'#9'c #000000",'#10'"+'#9'c #C0C0C0",'#10'"@'#9'c #FFFFFF",' + +#10'"#'#9'c #000080",'#10'" ",'#10'" .................' + +'. ",'#10'" .+.@+++++@+++++++. ",'#10'" .................. ",'#10'"' + +' .+.@@@@@+@@@@@@@@. ",'#10'" .@.@###@+@######@. ",'#10'" .+.@@@@@+@@@' + +'@@@@@. ",'#10'" .@.@###@+@#####@@. ",'#10'" .+.@@@@@+@@@@@@@@. ",' + +#10'" .@.@###@+@######@. ",'#10'" .+.@@@@@+@@@@@@@@. ",'#10'" .@.@###@' + +'+@#####@@. ",'#10'" .+.@@@@@+@@@@@@@@. ",'#10'" .................. ' + +' ",'#10'" # ",'#10'" # ",'#10'" ' + +' ## ### ## ",'#10'" # # # # # ",'#10'" ### # #' + +' # ",'#10'" # # # # # ",'#10'" # # # # # # ",'#10 + +'" ### ### ## ",'#10'" "};'#10 ]); LazarusResources.Add('ttimer','XPM',[ '/* XPM */'#10'static char * ttimer_xpm[] = {'#10'"17 17 5 1",'#10'" '#9'c No' diff --git a/lcl/controls.pp b/lcl/controls.pp index b507002df1..f543befd28 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -1115,8 +1115,8 @@ type property IsResizing: Boolean read GetIsResizing; property OnDockDrop: TDockDropEvent read FOnDockDrop write FOnDockDrop; property OnDockOver: TDockOverEvent read FOnDockOver write FOnDockOver; - property OnEnter : TNotifyEvent read FOnEnter write FOnEnter; - property OnExit : TNotifyEvent read FOnExit write FOnExit; + property OnEnter: TNotifyEvent read FOnEnter write FOnEnter; + property OnExit: TNotifyEvent read FOnExit write FOnExit; property OnKeyDown: TKeyEvent read FOnKeyDown write FOnKeyDown; property OnKeyPress: TKeyPressEvent read FOnKeyPress write FOnKeyPress; property OnKeyUp: TKeyEvent read FOnKeyUp write FOnKeyUp; @@ -1845,6 +1845,9 @@ end. { ============================================================================= $Log$ + Revision 1.152 2003/09/23 08:00:46 mattias + improved OnEnter for gtkcombo + Revision 1.151 2003/09/20 13:27:49 mattias varois improvements for ParentColor from Micha diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc index b607778857..4baebae16b 100644 --- a/lcl/include/wincontrol.inc +++ b/lcl/include/wincontrol.inc @@ -2337,7 +2337,7 @@ end; SetFocus event handler ------------------------------------------------------------------------------} -Procedure TWinControl.WMSetFocus(var Message : TLMSetFocus); +Procedure TWinControl.WMSetFocus(var Message: TLMSetFocus); Begin Assert(False, Format('Trace:TODO: [TWinControl.LMSetFocus] %s', [ClassName])); DoEnter; @@ -3096,6 +3096,9 @@ end; { ============================================================================= $Log$ + Revision 1.172 2003/09/23 08:00:46 mattias + improved OnEnter for gtkcombo + Revision 1.171 2003/09/20 13:27:49 mattias varois improvements for ParentColor from Micha diff --git a/lcl/interfaces/gtk/gtkobject.inc b/lcl/interfaces/gtk/gtkobject.inc index 47c467992a..b5aef8e2f9 100644 --- a/lcl/interfaces/gtk/gtkobject.inc +++ b/lcl/interfaces/gtk/gtkobject.inc @@ -3914,6 +3914,14 @@ procedure TGTKObject.SetCallback(Msg : LongInt; Sender: TObject); ConnectSignalAfter(AnObject,ASignal,ACallBackProc,TComponent(Sender), ReqSignalMask); end; + + procedure ConnectFocusEvents(const AnObject: PGTKObject); + begin + ConnectSenderSignal(AnObject, 'focus-in-event', @gtkFocusCB); + ConnectSenderSignalAfter(AnObject, 'focus-in-event', @gtkFocusCBAfter); + ConnectSenderSignal(AnObject, 'focus-out-event', @gtkKillFocusCB); + ConnectSenderSignalAfter(AnObject, 'focus-out-event', @gtkKillFocusCBAfter); + end; var gObject, gFixed, gCore, Scroll: PGTKObject; @@ -4008,20 +4016,11 @@ begin LM_FOCUS : begin - if (sender is TCustomComboBox) then begin - ConnectSenderSignal(PgtkObject(PgtkCombo(gObject)^.entry), - 'focus-in-event', @gtkFocusCB); - ConnectSenderSignal(PgtkObject(PgtkCombo(gObject)^.entry), - 'focus-out-event', @gtkKillFocusCBAfter); - ConnectSenderSignal(PgtkObject(PgtkCombo(gObject)^.list), - 'focus-in-event', @gtkFocusCB); - ConnectSenderSignal(PgtkObject(PgtkCombo(gObject)^.list), - 'focus-out-event', @gtkKillFocusCBAfter); + if (Sender is TCustomComboBox) then begin + ConnectFocusEvents(PgtkObject(PgtkCombo(gObject)^.entry)); + ConnectFocusEvents(PgtkObject(PgtkCombo(gObject)^.list)); end else begin - ConnectSenderSignal(gCore, 'focus-in-event', @gtkFocusCB); - ConnectSenderSignalAfter(gCore, 'focus-in-event', @gtkFocusCBAfter); - ConnectSenderSignal(gCore, 'focus-out-event', @gtkKillFocusCB); - ConnectSenderSignalAfter(gCore, 'focus-out-event', @gtkKillFocusCBAfter); + ConnectFocusEvents(gCore); end; end; @@ -8387,6 +8386,9 @@ end; { ============================================================================= $Log$ + Revision 1.425 2003/09/23 08:00:46 mattias + improved OnEnter for gtkcombo + Revision 1.424 2003/09/22 20:08:56 ajgenius break GTK2 object and winapi into includes like the GTK interface diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp index bc7ed961e1..62eac3cb48 100644 --- a/lcl/stdctrls.pp +++ b/lcl/stdctrls.pp @@ -302,9 +302,23 @@ type property Enabled; property Font; property ItemHeight; - property ItemWidth; property Items; + property ItemWidth; property MaxLength default -1; + property OnChange; + property OnChangeBounds; + property OnClick; + property OnCloseUp; + property OnDrawItem; + property OnDropDown; + property OnEnter; + property OnExit; + property OnKeyDown; + property OnKeyPress; + property OnKeyUp; + property OnMouseDown; + property OnMouseMove; + property OnMouseUp; property ParentCtl3D; property ParentFont; property ParentShowHint; @@ -315,16 +329,6 @@ type property TabStop; property Text; property Visible; - property OnChange; - property OnClick; - property OnCloseUp; - property OnDrawItem; - property OnDropDown; - property OnEnter; - property OnExit; - property OnKeyPress; - Property OnKeyDown; - Property OnKeyUp; end; @@ -1462,6 +1466,9 @@ end. { ============================================================================= $Log$ + Revision 1.106 2003/09/23 08:00:46 mattias + improved OnEnter for gtkcombo + Revision 1.105 2003/09/18 11:24:29 mattias started TDBMemo