From 4e33251c35778847aa5e7428670a3fc19eebe1a7 Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 12 Feb 2008 05:40:57 +0000 Subject: [PATCH] bunch of compatibility fixes with fpc 2.2 rtl if win32extra will be cleaned git-svn-id: trunk@14098 - --- lcl/interfaces/win32/win32extra.pas | 11 +---------- lcl/interfaces/win32/win32lclintf.inc | 8 ++++---- lcl/interfaces/win32/win32wscomctrls.pp | 2 +- lcl/interfaces/win32/win32wsdialogs.pp | 10 +++++++--- lcl/interfaces/win32/win32wsextctrls.pp | 8 +++++--- lcl/interfaces/win32/win32wsimglist.pp | 9 ++++++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lcl/interfaces/win32/win32extra.pas b/lcl/interfaces/win32/win32extra.pas index 498dac3f2f..2ba5f91ecc 100644 --- a/lcl/interfaces/win32/win32extra.pas +++ b/lcl/interfaces/win32/win32extra.pas @@ -68,7 +68,7 @@ type tagIMAGELISTDRAWPARAMS = record cbSize: DWORD; - himlL: HIMAGELIST; + himl: HIMAGELIST; i: integer; hdcDst: HDC; x: integer; @@ -312,15 +312,6 @@ SWP_DEFERERASE = $2000; SWP_ASYNCWINDOWPOS = $4000; SWP_STATECHANGED = $8000; // used by windows but not documented (used even in wine) -{not used anymore -// missing listview macros -function ListView_GetHeader(hwndLV: HWND): HWND; -function ListView_GetExtendedListViewStyle(hwndLV: HWND): DWORD; -function ListView_SetExtendedListViewStyle(hwndLV: HWND; dw: DWORD): BOOL; -function ListView_GetHoverTime(hwndLV: HWND): DWORD; -function ListView_SetHoverTime(hwndLV: HWND; dwHoverTimeMs: DWORD): DWORD; -} - // missing imagelist macros and constants const diff --git a/lcl/interfaces/win32/win32lclintf.inc b/lcl/interfaces/win32/win32lclintf.inc index c65da70ab2..933154f1a2 100644 --- a/lcl/interfaces/win32/win32lclintf.inc +++ b/lcl/interfaces/win32/win32lclintf.inc @@ -355,10 +355,10 @@ var Pixel: PRGBAQuad; begin case StockID of - idDialogWarning: IconHandle := LoadImage(0, OIC_WARNING, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE or LR_SHARED); - idDialogError : IconHandle := LoadImage(0, OIC_ERROR, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE or LR_SHARED); - idDialogInfo : IconHandle := LoadImage(0, OIC_INFORMATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE or LR_SHARED); - idDialogConfirm: IconHandle := LoadImage(0, OIC_QUES, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE or LR_SHARED); + idDialogWarning: IconHandle := LoadImage(0, IDI_WARNING, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE or LR_SHARED); + idDialogError : IconHandle := LoadImage(0, IDI_ERROR, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE or LR_SHARED); + idDialogInfo : IconHandle := LoadImage(0, IDI_INFORMATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE or LR_SHARED); + idDialogConfirm: IconHandle := LoadImage(0, IDI_QUESTION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE or LR_SHARED); else IconHandle := 0; end; diff --git a/lcl/interfaces/win32/win32wscomctrls.pp b/lcl/interfaces/win32/win32wscomctrls.pp index 167f64a603..d0e8fc31e7 100644 --- a/lcl/interfaces/win32/win32wscomctrls.pp +++ b/lcl/interfaces/win32/win32wscomctrls.pp @@ -28,7 +28,7 @@ interface uses // FCL - Windows, Classes, SysUtils, Win32Extra, + CommCtrl, Windows, Classes, SysUtils, Win32Extra, // LCL ComCtrls, LCLType, Controls, Graphics, ImgList, StdCtrls, diff --git a/lcl/interfaces/win32/win32wsdialogs.pp b/lcl/interfaces/win32/win32wsdialogs.pp index 6525b87df8..2dcc0f9862 100644 --- a/lcl/interfaces/win32/win32wsdialogs.pp +++ b/lcl/interfaces/win32/win32wsdialogs.pp @@ -33,9 +33,12 @@ uses // To get as little as posible circles, // uncomment only when needed for registration //////////////////////////////////////////////////// - LCLProc, LCLType, Dialogs, Controls, Graphics, SysUtils, Classes, Forms, -//////////////////////////////////////////////////// - WSDialogs, WSLCLClasses, Windows, Win32Extra, Win32Int, InterfaceBase, +// rtl + Windows, ShellApi, ActiveX, SysUtils, Classes, +// lcl + LCLProc, LCLType, Dialogs, Controls, Graphics, Forms, +// ws + WSDialogs, WSLCLClasses, Win32Extra, Win32Int, InterfaceBase, Win32Proc; type @@ -808,6 +811,7 @@ begin end; Result := 0; end; + class function TWin32WSSelectDirectoryDialog.CreateHandle(const ACommonDialog: TCommonDialog): THandle; var bi : TBrowseInfo; diff --git a/lcl/interfaces/win32/win32wsextctrls.pp b/lcl/interfaces/win32/win32wsextctrls.pp index d89bf232e5..f72fa94fc4 100644 --- a/lcl/interfaces/win32/win32wsextctrls.pp +++ b/lcl/interfaces/win32/win32wsextctrls.pp @@ -32,9 +32,11 @@ uses // To get as little as posible circles, // uncomment only when needed for registration //////////////////////////////////////////////////// - SysUtils, Windows, ExtCtrls, Classes, Controls, ImgList, LCLType, LCLIntf, - Themes, -//////////////////////////////////////////////////// +// rtl + Windows, CommCtrl, SysUtils, Classes, +// lcl + ExtCtrls, Controls, ImgList, LCLType, LCLIntf, Themes, +// ws WSControls, WSExtCtrls, WSLCLClasses, WSProc, Win32Extra, Win32Int, Win32Proc, InterfaceBase, Win32WSControls; diff --git a/lcl/interfaces/win32/win32wsimglist.pp b/lcl/interfaces/win32/win32wsimglist.pp index c6e57cdb71..ab64d07ba0 100644 --- a/lcl/interfaces/win32/win32wsimglist.pp +++ b/lcl/interfaces/win32/win32wsimglist.pp @@ -33,9 +33,12 @@ uses // To get as little as posible circles, // uncomment only when needed for registration //////////////////////////////////////////////////// - Windows, SysUtils, Classes, ImgList, GraphType, Graphics, LCLType, +// rtl + Windows, CommCtrl, SysUtils, Classes, +// lcl + ImgList, GraphType, Graphics, LCLType, +// ws Win32Extra, Win32Int, Win32Proc, InterfaceBase, -//////////////////////////////////////////////////// WSImgList, WSLCLClasses, WSProc, WSReferences; type @@ -296,7 +299,7 @@ begin // if it is manifested exe then use winXP algoriphm of gray painting FillChar(DrawParams, SizeOf(DrawParams), 0); DrawParams.cbSize := SizeOf(DrawParams); - DrawParams.himlL := AList.Reference._Handle; + DrawParams.himl := AList.Reference._Handle; DrawParams.i := AIndex; DrawParams.hdcDst := ADC; DrawParams.x := ABounds.Left;