paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-25 17:29:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL-Win32: Cleanup.

Browse Source
This commit is contained in:
Juha 2023-05-21 09:02:45 +03:00
parent dd362403a3
commit e9a9bd4f1d
3 changed files with 7 additions and 8 deletions

2
lcl/interfaces/win32/win32trayicon.inc
View File

@ -222,7 +222,7 @@ end;
*******************************************************************}
class function TWin32WSCustomTrayIcon.Show(const ATrayIcon: TCustomTrayIcon): Boolean;
var
Window: Windows.TWNDClassEx; // lp: LPWNDCLASS;
Window: Windows.TWNDClassEx;
begin
if not GetClassInfoEx(hInstance, szClassName, @Window) then
begin

1
lcl/interfaces/win32/win32wscontrols.pp
View File

@ -186,7 +186,6 @@ var
AErrorCode: Cardinal;
NCCreateParams: TNCCreateParams;
WindowClassW, DummyClassW: WndClassW;
lp: LPWNDCLASSW;
begin
NCCreateParams.DefWndProc := nil;
NCCreateParams.WinControl := AWinControl;

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

@ -214,7 +214,7 @@ end;
function FindMenuItemAccelerator(const ACharCode: word; const AMenuHandle: HMENU): integer;
var
MenuItemIndex: integer;
ItemInfo: MENUITEMINFOW; // TMenuItemInfoA and TMenuItemInfoW have same size and same structure type
ItemInfo: MENUITEMINFOW;
FirstMenuItem: TMenuItem;
SiblingMenuItem: TMenuItem;
i: integer;
@ -1382,7 +1382,7 @@ end;
function ChangeMenuFlag(const AMenuItem: TMenuItem; Flag: Cardinal; Value: boolean): boolean;
var
MenuInfo: MENUITEMINFOW; // TMenuItemInfoA and TMenuItemInfoW have same size and same structure type
MenuInfo: MENUITEMINFOW;
begin
MenuInfo := Default(MENUITEMINFOW);
MenuInfo.cbSize := sizeof(TMenuItemInfoW);
@ -1405,7 +1405,7 @@ end;
------------------------------------------------------------------------------}
procedure SetMenuFlag(const Menu: HMenu; Flag: Cardinal; Value: boolean);
var
MenuInfo: MENUITEMINFOW; // TMenuItemInfoA and TMenuItemInfoW have same size and same structure type
MenuInfo: MENUITEMINFOW;
begin
MenuInfo := Default(MENUITEMINFOW);
MenuInfo.cbSize := sizeof(TMenuItemInfoW);
@ -1422,7 +1422,7 @@ end;
procedure UpdateCaption(const AMenuItem: TMenuItem; ACaption: String);
var
MenuInfo: MENUITEMINFOW; // TMenuItemInfoA and TMenuItemInfoW have same size and same structure type
MenuInfo: MENUITEMINFOW;
WideBuffer: widestring;
begin
if (AMenuItem.MergedParent = nil) or not AMenuItem.MergedParent.HandleAllocated then
@ -1480,7 +1480,7 @@ end;
class procedure TWin32WSMenuItem.AttachMenu(const AMenuItem: TMenuItem);
var
MenuInfo: MENUITEMINFOW; // TMenuItemInfoA and TMenuItemInfoW have same size and same structure type
MenuInfo: MENUITEMINFOW;
ParentMenuHandle: HMenu;
ParentOfParent: HMenu;
CallMenuRes: Boolean;
@ -1583,7 +1583,7 @@ end;
class procedure TWin32WSMenuItem.DestroyHandle(const AMenuItem: TMenuItem);
var
ParentOfParentHandle, ParentHandle: HMENU;
MenuInfo: MENUITEMINFOW; // TMenuItemInfoA and TMenuItemInfoW have same size and same structure type
MenuInfo: MENUITEMINFOW;
CallMenuRes: Boolean;
begin
if Assigned(AMenuItem.MergedParent) then