paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-30 21:10:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32, wince: make sure all LoadIcon, LoadCursor go to windows unit instead of graphics

Browse Source 
git-svn-id: trunk@30010 -
This commit is contained in:
paul 2011-03-25 06:04:41 +00:00
parent f46538af44
commit 2e3d386b9e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/interfaces/win32/win32lclintf.inc
View File

@ -363,7 +363,7 @@ begin
case DialogType of case DialogType of
idDialogConfirm: idDialogConfirm:
begin begin
TaskConfig.hMainIcon := LoadIcon(0, IDI_QUESTION); TaskConfig.hMainIcon := Windows.LoadIcon(0, IDI_QUESTION);
TaskConfig.dwFlags := TaskConfig.dwFlags or TDF_USE_HICON_MAIN; TaskConfig.dwFlags := TaskConfig.dwFlags or TDF_USE_HICON_MAIN;
end; end;
idDialogInfo: TaskConfig.pszMainIcon := TD_INFORMATION_ICON; idDialogInfo: TaskConfig.pszMainIcon := TD_INFORMATION_ICON;
@ -710,7 +710,7 @@ begin
case DialogType of case DialogType of
idDialogConfirm: idDialogConfirm:
begin begin
TaskConfig.hMainIcon := LoadIcon(0, IDI_QUESTION); TaskConfig.hMainIcon := Windows.LoadIcon(0, IDI_QUESTION);
TaskConfig.dwFlags := TaskConfig.dwFlags or TDF_USE_HICON_MAIN; TaskConfig.dwFlags := TaskConfig.dwFlags or TDF_USE_HICON_MAIN;
end; end;
idDialogInfo: TaskConfig.pszMainIcon := TD_INFORMATION_ICON; idDialogInfo: TaskConfig.pszMainIcon := TD_INFORMATION_ICON;

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

@ -280,7 +280,7 @@ begin
Window.cbClsExtra := 0; Window.cbClsExtra := 0;
Window.cbWndExtra := 0; Window.cbWndExtra := 0;
Window.hInstance := hInstance; Window.hInstance := hInstance;
Window.hCursor := LoadCursor(0, IDC_ARROW); Window.hCursor := Windows.LoadCursor(0, IDC_ARROW);
Window.hbrBackground := HBRUSH(GetStockObject(NULL_BRUSH)); Window.hbrBackground := HBRUSH(GetStockObject(NULL_BRUSH));
Window.lpszMenuName := nil; Window.lpszMenuName := nil;
Window.lpszClassName := szClassName; Window.lpszClassName := szClassName;

2
lcl/interfaces/wince/winceobject.inc
View File

@ -536,7 +536,7 @@ begin
hIcon := Windows.LoadIcon(System.hInstance, nil); hIcon := Windows.LoadIcon(System.hInstance, nil);
if hIcon = 0 then if hIcon = 0 then
hIcon := Windows.LoadIcon(0, IDI_APPLICATION); hIcon := Windows.LoadIcon(0, IDI_APPLICATION);
hCursor := LoadCursor(0, IDC_ARROW); hCursor := Windows.LoadCursor(0, IDC_ARROW);
hbrBackground := 0; hbrBackground := 0;
LPSzMenuName := nil; LPSzMenuName := nil;
LPSzClassName := @ClsName; LPSzClassName := @ClsName;