From 664f41ac030a485f61204a007b486901005c244c Mon Sep 17 00:00:00 2001 From: micha Date: Fri, 14 May 2004 15:20:47 +0000 Subject: [PATCH] fix sizing when menu is attached to window git-svn-id: trunk@5471 - --- lcl/interfaces/win32/win32object.inc | 11 ++++++++++- lcl/interfaces/win32/win32proc.inc | 5 ++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc index af0456d739..e77d78af5b 100644 --- a/lcl/interfaces/win32/win32object.inc +++ b/lcl/interfaces/win32/win32object.inc @@ -1251,10 +1251,16 @@ end; procedure TWin32WidgetSet.AttachMenuToWindow(AMenuObject: TComponent); var AMenu: TMenu; + AWinControl: TWinControl; begin AMenu := AMenuObject as TMenu; if AMenu.FCompStyle = csMainMenu then - Windows.SetMenu(TWinControl(AMenu.Owner).Handle, AMenu.Handle); + begin + AWinControl := TWinControl(AMenu.Owner); + Windows.SetMenu(AWinControl.Handle, AMenu.Handle); + // inform LCL of changed client size + AWinControl.DoAdjustClientRectChange; + end; end; { Private methods (in no significant order) } @@ -2953,6 +2959,9 @@ End; { $Log$ + Revision 1.193 2004/05/14 15:20:47 micha + fix sizing when menu is attached to window + Revision 1.192 2004/05/12 15:11:46 micha fix sizing/non-sizing border sizes diff --git a/lcl/interfaces/win32/win32proc.inc b/lcl/interfaces/win32/win32proc.inc index 2504b9264e..0149212f7d 100644 --- a/lcl/interfaces/win32/win32proc.inc +++ b/lcl/interfaces/win32/win32proc.inc @@ -568,7 +568,7 @@ begin if SendSizeMsgOnDiff then begin //writeln('LCLBoundsNeedsUpdate B ',TheWinControl.Name,':',TheWinControl.ClassName,' Sending WM_SIZE'); Sender.InvalidateClientRectCache(true); - SendMessage(Window, WM_SIZE, 0, MakeLParam(IntfWidth, IntfHeight)); + Windows.PostMessage(Window, WM_SIZE, 0, MakeLParam(IntfWidth, IntfHeight)); end; end; @@ -761,6 +761,9 @@ end; { ============================================================================= $Log$ + Revision 1.41 2004/05/14 15:20:47 micha + fix sizing when menu is attached to window + Revision 1.40 2004/05/12 15:11:46 micha fix sizing/non-sizing border sizes