From 8c14b33a27ebd2fe6264d0620a8b47b8424c2be3 Mon Sep 17 00:00:00 2001 From: sekelsenmat Date: Wed, 6 May 2009 14:45:03 +0000 Subject: [PATCH] Fixes compiling the wince interface for desktop windows git-svn-id: trunk@19827 - --- lcl/interfaces/wince/wincedef.pp | 10 +++++++++- lcl/interfaces/wince/wincewinapi.inc | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lcl/interfaces/wince/wincedef.pp b/lcl/interfaces/wince/wincedef.pp index ee56bab8c1..331beefbcf 100644 --- a/lcl/interfaces/wince/wincedef.pp +++ b/lcl/interfaces/wince/wincedef.pp @@ -110,11 +110,19 @@ type TimerFunc: TFNTimerProc; // owner function to handle timer end; +{$ifdef WinCE} function EnumDisplayMonitors(hdc: HDC; lprcClip: PRect; lpfnEnum: MONITORENUMPROC; dwData: LPARAM): LongBool; cdecl; external KernelDLL name 'EnumDisplayMonitors'; -function GetMonitorInfo(hMonitor: HMONITOR; lpmi: PMonitorInfo): LongBool; cdecl; external KernelDLL name 'GetMonitorInfo'; +function GetMonitorInfoW(hMonitor: HMONITOR; lpmi: PMonitorInfo): LongBool; cdecl; external KernelDLL name 'GetMonitorInfo'; function MonitorFromWindow(hWnd: HWND; dwFlags: DWORD): HMONITOR; cdecl; external KernelDLL name 'MonitorFromWindow'; function MonitorFromRect(lprcScreenCoords: PRect; dwFlags: DWord): HMONITOR; cdecl; external KernelDLL name 'MonitorFromRect'; function MonitorFromPoint(ptScreenCoords: TPoint; dwFlags: DWord): HMONITOR; cdecl; external KernelDLL name 'MonitorFromPoint'; +{$else} +function EnumDisplayMonitors(hdc: HDC; lprcClip: PRect; lpfnEnum: MONITORENUMPROC; dwData: LPARAM): LongBool; stdcall; external 'user32.dll' name 'EnumDisplayMonitors'; +function GetMonitorInfoW(hMonitor: HMONITOR; lpmi: PMonitorInfo): LongBool; stdcall; external 'user32.dll' name 'GetMonitorInfoW'; +function MonitorFromWindow(hWnd: HWND; dwFlags: DWORD): HMONITOR; stdcall; external 'user32.dll' name 'MonitorFromWindow'; +function MonitorFromRect(lprcScreenCoords: PRect; dwFlags: DWord): HMONITOR; stdcall; external 'user32.dll' name 'MonitorFromRect'; +function MonitorFromPoint(ptScreenCoords: TPoint; dwFlags: DWord): HMONITOR; stdcall; external 'user32.dll' name 'MonitorFromPoint'; +{$endif} var // FTimerData contains the currently running timers diff --git a/lcl/interfaces/wince/wincewinapi.inc b/lcl/interfaces/wince/wincewinapi.inc index 2e18307d4a..5cc6f78c64 100644 --- a/lcl/interfaces/wince/wincewinapi.inc +++ b/lcl/interfaces/wince/wincewinapi.inc @@ -1357,14 +1357,14 @@ begin if (lpmi <> nil) and (lpmi^.cbSize >= SizeOf(TMonitorInfoEx)) then begin LocalInfo.cbSize := SizeOf(TMonitorInfoExW); - Result := WinCEDef.GetMonitorInfo(hMonitor, @LocalInfo); + Result := WinCEDef.GetMonitorInfoW(hMonitor, @LocalInfo); lpmi^.rcMonitor := LocalInfo.rcMonitor; lpmi^.rcWork := LocalInfo.rcWork; lpmi^.dwFlags := LocalInfo.dwFlags; PMonitorInfoEx(lpmi)^.szDevice := UTF16ToUTF8(LocalInfo.szDevice); end else - Result := WinCEDef.GetMonitorInfo(hMonitor, lpmi); + Result := WinCEDef.GetMonitorInfoW(hMonitor, lpmi); end; {------------------------------------------------------------------------------