paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-11 23:18:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix menu drawing in form (win32, fixes bug #1249)

Browse Source 
git-svn-id: trunk@7860 -
This commit is contained in:
micha 2005-09-30 18:11:23 +00:00
parent 4a7241572d
commit 14919eb9e7
2 changed files with 25 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lcl/interfaces/win32/win32proc.pp
View File

@ -1040,21 +1040,8 @@ end;
Adds Window to the list of windows which need to redraw the main menu.
-------------------------------------------------------------------------------}
procedure AddToChangedMenus(Window: HWnd);
{only add window handle if it does not yet exist in the list}
function FindHandle: integer;
var i: integer;
begin
for i := 0 to ChangedMenus.Count - 1 do
if HWnd(ChangedMenus[i]) = Window then
begin
Result := i;
exit;
end;
Result := ChangedMenus.Count;
end;
begin
if FindHandle = ChangedMenus.Count then // Window handle is not yet in the list
if ChangedMenus.IndexOf(Pointer(Window)) = -1 then // Window handle is not yet in the list
ChangedMenus.Add(Pointer(Window));
end;
@ -1066,12 +1053,12 @@ end;
Redraws all changed menus
------------------------------------------------------------------------------}
procedure RedrawMenus;
var
I: integer;
begin
while ChangedMenus.Count > 0 do
begin
DrawMenuBar(HWND(ChangedMenus[0]));
ChangedMenus.Delete(0);
end;
for I := 0 to ChangedMenus.Count - 1 do
DrawMenuBar(HWND(ChangedMenus[I]));
ChangedMenus.Clear;
end;
function MeasureText(const AWinControl: TWinControl; Text: string; var Width, Height: integer): boolean;

50
lcl/interfaces/win32/win32wsmenus.pp
View File

@ -87,6 +87,20 @@ type
implementation
{ helper routines }
procedure TriggerFormUpdate(const AMenuItem: TMenuItem);
var
lMenu: TMenu;
begin
lMenu := AMenuItem.GetParentMenu;
if (lMenu<>nil) and (lMenu.Parent<>nil)
and (lMenu.Parent is TCustomForm)
and TCustomForm(lMenu.Parent).HandleAllocated
and not (csDestroying in lMenu.Parent.ComponentState) then
AddToChangedMenus(TCustomForm(lMenu.Parent).Handle);
end;
{ TWin32WSMenuItem }
procedure UpdateCaption(const AMenuItem: TMenuItem; ACaption: String);
@ -114,12 +128,7 @@ begin
else fType := MFT_SEPARATOR;
end;
SetMenuItemInfo(AMenuItem.Parent.Handle, AMenuItem.Command, false, @MenuInfo);
// owner could be a popupmenu too
if (AMenuItem.Owner is TWinControl) and
TWinControl(AMenuItem.Owner).HandleAllocated and
TWinControl(AMenuItem.Owner).Visible and
([csLoading,csDestroying] * TWinControl(AMenuItem.Owner).ComponentState = []) then
AddToChangedMenus(TWinControl(AMenuItem.Owner).Handle);
TriggerFormUpdate(AMenuItem);
end;
procedure TWin32WSMenuItem.AttachMenu(const AMenuItem: TMenuItem);
@ -247,12 +256,7 @@ begin
if dword(InsertMenuItem(ParentMenuHandle,
AMenuItem.Parent.VisibleIndexOf(AMenuItem), true, @MenuInfo)) = 0 then
DebugLn('InsertMenuItem failed with error: ', IntToStr(Windows.GetLastError));
// owner could be a popupmenu too
if (AMenuItem.Owner is TWinControl) and
TWinControl(AMenuItem.Owner).HandleAllocated and
TWinControl(AMenuItem.Owner).Visible and
([csLoading,csDestroying] * TWinControl(AMenuItem.Owner).ComponentState = []) then
AddToChangedMenus(TWinControl(AMenuItem.Owner).Handle);
TriggerFormUpdate(AMenuItem);
end;
function TWin32WSMenuItem.CreateHandle(const AMenuItem: TMenuItem): HMENU;
@ -261,19 +265,11 @@ begin
end;
procedure TWin32WSMenuItem.DestroyHandle(const AMenuItem: TMenuItem);
var
AMenu: TMenu;
begin
{ not assigned when this the menuitem of a TMenu; handle is destroyed above }
if Assigned(AMenuItem.Parent) then
DeleteMenu(AMenuItem.Parent.Handle, AMenuItem.Command, MF_BYCOMMAND);
AMenu := AMenuItem.GetParentMenu;
if (AMenu<>nil) and (AMenu.Parent<>nil)
and (AMenu.Parent is TCustomForm)
and TCustomForm(AMenu.Parent).HandleAllocated
and TCustomForm(AMenu.Parent).Visible
and not (csDestroying in AMenu.Parent.ComponentState) then
AddToChangedMenus(TWinControl(AMenu.Parent).Handle);
TriggerFormUpdate(AMenuItem);
end;
procedure TWin32WSMenuItem.SetCaption(const AMenuItem: TMenuItem; const ACaption: string);
@ -340,11 +336,7 @@ begin
else EnableFlag := MF_GRAYED;
EnableFlag := EnableFlag or MF_BYCOMMAND;
Result := Boolean(Windows.EnableMenuItem(AMenuItem.Parent.Handle, AMenuItem.Command, EnableFlag));
if (AMenuItem.Owner is TWinControl) and
TWinControl(AMenuItem.Owner).HandleAllocated and
TWinControl(AMenuItem.Owner).Visible and
([csLoading,csDestroying] * TWinControl(AMenuItem.Owner).ComponentState = []) then
AddToChangedMenus(TWinControl(AMenuItem.Owner).Handle);
TriggerFormUpdate(AMenuItem);
end;
function TWin32WSMenuItem.SetRightJustify(const AMenuItem: TMenuItem; const Justified: boolean): boolean;
@ -358,11 +350,7 @@ begin
else MenuInfo.fType := MenuInfo.fType and (not MFT_RIGHTJUSTIFY);
MenuInfo.dwTypeData := LPSTR(AMenuItem.Caption);
Result := SetMenuItemInfo(AMenuItem.Parent.Handle, AMenuItem.Command, false, @MenuInfo);
if (AMenuItem.Owner is TWinControl) and
TWinControl(AMenuItem.Owner).HandleAllocated and
TWinControl(AMenuItem.Owner).Visible and
([csLoading,csDestroying] * TWinControl(AMenuItem.Owner).ComponentState = []) then
AddToChangedMenus(TWinControl(AMenuItem.Owner).Handle);
TriggerFormUpdate(AMenuItem);
end;