From ec6bd0f076c501a617ace11375fc0f47d3af5429 Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 16 Mar 2010 18:52:14 +0000 Subject: [PATCH] gtk intf: do not allocate size for notebook on add page git-svn-id: trunk@24047 - --- lcl/interfaces/gtk/gtkcallback.inc | 1 - lcl/interfaces/gtk/gtkwsextctrls.pp | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lcl/interfaces/gtk/gtkcallback.inc b/lcl/interfaces/gtk/gtkcallback.inc index 1f90d86567..f569bdafb2 100644 --- a/lcl/interfaces/gtk/gtkcallback.inc +++ b/lcl/interfaces/gtk/gtkcallback.inc @@ -495,7 +495,6 @@ end; function gtkchanged_editbox_backspace(widget: PGtkWidget; data: gPointer): GBoolean; cdecl; var - Mess : TLMessage; GStart, GEnd: gint; Info: PWidgetInfo; EntryText: PgChar; diff --git a/lcl/interfaces/gtk/gtkwsextctrls.pp b/lcl/interfaces/gtk/gtkwsextctrls.pp index 04ac703ab3..5ffac4e422 100644 --- a/lcl/interfaces/gtk/gtkwsextctrls.pp +++ b/lcl/interfaces/gtk/gtkwsextctrls.pp @@ -381,7 +381,9 @@ var MenuWidget: PGtkWidget; // the popup menu (hbox containing a pixmap and // a label) MenuLabelWidget: PGtkWidget; // the label in the popup menu item + {$IFDEF OldAutoSize} allocation: TGtkAllocation; + {$ENDIF} begin {$IFDEF NOTEBOOK_DEBUG} DebugLn(['TGtkWSCustomNotebook.AddPage ',dbgsName(ANoteBook),' ',ANotebook.HandleAllocated,' AChild=',dbgsName(AChild),' ',AChild.HandleAllocated,' Child.TabVisible=',AChild.TabVisible]); @@ -440,6 +442,8 @@ begin UpdateNoteBookClientWidget(ANoteBook); // init the size of the page widget + //DebugLn(['TGtkWSCustomNotebook.AddPage ',DbgSName(ANoteBook),' ',dbgs(ANoteBook.BoundsRect)]); + {$IFDEF OldAutoSize} allocation.x := ANoteBook.Left; allocation.y := ANoteBook.Top; allocation.width := ANoteBook.Width; @@ -448,6 +452,7 @@ begin {$IFDEF VerboseSizeMsg} DebugLn(['TGtkWSCustomNotebook.AddPage PageWidget^.allocation=',dbgs(PageWidget^.allocation),' NotebookWidget=',dbgs(NotebookWidget^.allocation)]); {$ENDIF} + {$ENDIF} end; class procedure TGtkWSCustomNotebook.MovePage(const ANotebook: TCustomNotebook;