From 2e3d386b9ee9b692da070008ab6f6c573963ee13 Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 25 Mar 2011 06:04:41 +0000 Subject: [PATCH] win32, wince: make sure all LoadIcon, LoadCursor go to windows unit instead of graphics git-svn-id: trunk@30010 - --- lcl/interfaces/win32/win32lclintf.inc | 4 ++-- lcl/interfaces/win32/win32trayicon.inc | 2 +- lcl/interfaces/wince/winceobject.inc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lcl/interfaces/win32/win32lclintf.inc b/lcl/interfaces/win32/win32lclintf.inc index 9b19e20cff..6841a9057b 100644 --- a/lcl/interfaces/win32/win32lclintf.inc +++ b/lcl/interfaces/win32/win32lclintf.inc @@ -363,7 +363,7 @@ begin case DialogType of idDialogConfirm: begin - TaskConfig.hMainIcon := LoadIcon(0, IDI_QUESTION); + TaskConfig.hMainIcon := Windows.LoadIcon(0, IDI_QUESTION); TaskConfig.dwFlags := TaskConfig.dwFlags or TDF_USE_HICON_MAIN; end; idDialogInfo: TaskConfig.pszMainIcon := TD_INFORMATION_ICON; @@ -710,7 +710,7 @@ begin case DialogType of idDialogConfirm: begin - TaskConfig.hMainIcon := LoadIcon(0, IDI_QUESTION); + TaskConfig.hMainIcon := Windows.LoadIcon(0, IDI_QUESTION); TaskConfig.dwFlags := TaskConfig.dwFlags or TDF_USE_HICON_MAIN; end; idDialogInfo: TaskConfig.pszMainIcon := TD_INFORMATION_ICON; diff --git a/lcl/interfaces/win32/win32trayicon.inc b/lcl/interfaces/win32/win32trayicon.inc index edc68eb28a..db4d864922 100644 --- a/lcl/interfaces/win32/win32trayicon.inc +++ b/lcl/interfaces/win32/win32trayicon.inc @@ -280,7 +280,7 @@ begin Window.cbClsExtra := 0; Window.cbWndExtra := 0; Window.hInstance := hInstance; - Window.hCursor := LoadCursor(0, IDC_ARROW); + Window.hCursor := Windows.LoadCursor(0, IDC_ARROW); Window.hbrBackground := HBRUSH(GetStockObject(NULL_BRUSH)); Window.lpszMenuName := nil; Window.lpszClassName := szClassName; diff --git a/lcl/interfaces/wince/winceobject.inc b/lcl/interfaces/wince/winceobject.inc index dceab88157..05aaff8dd4 100644 --- a/lcl/interfaces/wince/winceobject.inc +++ b/lcl/interfaces/wince/winceobject.inc @@ -536,7 +536,7 @@ begin hIcon := Windows.LoadIcon(System.hInstance, nil); if hIcon = 0 then hIcon := Windows.LoadIcon(0, IDI_APPLICATION); - hCursor := LoadCursor(0, IDC_ARROW); + hCursor := Windows.LoadCursor(0, IDC_ARROW); hbrBackground := 0; LPSzMenuName := nil; LPSzClassName := @ClsName;