mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-16 04:59:20 +02:00
bunch of compatibility fixes with fpc 2.2 rtl if win32extra will be cleaned
git-svn-id: trunk@14098 -
This commit is contained in:
parent
84ee51a2cd
commit
4e33251c35
@ -68,7 +68,7 @@ type
|
|||||||
|
|
||||||
tagIMAGELISTDRAWPARAMS = record
|
tagIMAGELISTDRAWPARAMS = record
|
||||||
cbSize: DWORD;
|
cbSize: DWORD;
|
||||||
himlL: HIMAGELIST;
|
himl: HIMAGELIST;
|
||||||
i: integer;
|
i: integer;
|
||||||
hdcDst: HDC;
|
hdcDst: HDC;
|
||||||
x: integer;
|
x: integer;
|
||||||
@ -312,15 +312,6 @@ SWP_DEFERERASE = $2000;
|
|||||||
SWP_ASYNCWINDOWPOS = $4000;
|
SWP_ASYNCWINDOWPOS = $4000;
|
||||||
SWP_STATECHANGED = $8000; // used by windows but not documented (used even in wine)
|
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
|
// missing imagelist macros and constants
|
||||||
|
|
||||||
const
|
const
|
||||||
|
@ -355,10 +355,10 @@ var
|
|||||||
Pixel: PRGBAQuad;
|
Pixel: PRGBAQuad;
|
||||||
begin
|
begin
|
||||||
case StockID of
|
case StockID of
|
||||||
idDialogWarning: IconHandle := LoadImage(0, OIC_WARNING, 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, OIC_ERROR, 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, OIC_INFORMATION, 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, OIC_QUES, 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
|
else
|
||||||
IconHandle := 0;
|
IconHandle := 0;
|
||||||
end;
|
end;
|
||||||
|
@ -28,7 +28,7 @@ interface
|
|||||||
|
|
||||||
uses
|
uses
|
||||||
// FCL
|
// FCL
|
||||||
Windows, Classes, SysUtils, Win32Extra,
|
CommCtrl, Windows, Classes, SysUtils, Win32Extra,
|
||||||
// LCL
|
// LCL
|
||||||
ComCtrls, LCLType, Controls, Graphics,
|
ComCtrls, LCLType, Controls, Graphics,
|
||||||
ImgList, StdCtrls,
|
ImgList, StdCtrls,
|
||||||
|
@ -33,9 +33,12 @@ uses
|
|||||||
// To get as little as posible circles,
|
// To get as little as posible circles,
|
||||||
// uncomment only when needed for registration
|
// uncomment only when needed for registration
|
||||||
////////////////////////////////////////////////////
|
////////////////////////////////////////////////////
|
||||||
LCLProc, LCLType, Dialogs, Controls, Graphics, SysUtils, Classes, Forms,
|
// rtl
|
||||||
////////////////////////////////////////////////////
|
Windows, ShellApi, ActiveX, SysUtils, Classes,
|
||||||
WSDialogs, WSLCLClasses, Windows, Win32Extra, Win32Int, InterfaceBase,
|
// lcl
|
||||||
|
LCLProc, LCLType, Dialogs, Controls, Graphics, Forms,
|
||||||
|
// ws
|
||||||
|
WSDialogs, WSLCLClasses, Win32Extra, Win32Int, InterfaceBase,
|
||||||
Win32Proc;
|
Win32Proc;
|
||||||
|
|
||||||
type
|
type
|
||||||
@ -808,6 +811,7 @@ begin
|
|||||||
end;
|
end;
|
||||||
Result := 0;
|
Result := 0;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
class function TWin32WSSelectDirectoryDialog.CreateHandle(const ACommonDialog: TCommonDialog): THandle;
|
class function TWin32WSSelectDirectoryDialog.CreateHandle(const ACommonDialog: TCommonDialog): THandle;
|
||||||
var
|
var
|
||||||
bi : TBrowseInfo;
|
bi : TBrowseInfo;
|
||||||
|
@ -32,9 +32,11 @@ uses
|
|||||||
// To get as little as posible circles,
|
// To get as little as posible circles,
|
||||||
// uncomment only when needed for registration
|
// uncomment only when needed for registration
|
||||||
////////////////////////////////////////////////////
|
////////////////////////////////////////////////////
|
||||||
SysUtils, Windows, ExtCtrls, Classes, Controls, ImgList, LCLType, LCLIntf,
|
// rtl
|
||||||
Themes,
|
Windows, CommCtrl, SysUtils, Classes,
|
||||||
////////////////////////////////////////////////////
|
// lcl
|
||||||
|
ExtCtrls, Controls, ImgList, LCLType, LCLIntf, Themes,
|
||||||
|
// ws
|
||||||
WSControls, WSExtCtrls, WSLCLClasses, WSProc, Win32Extra, Win32Int, Win32Proc,
|
WSControls, WSExtCtrls, WSLCLClasses, WSProc, Win32Extra, Win32Int, Win32Proc,
|
||||||
InterfaceBase, Win32WSControls;
|
InterfaceBase, Win32WSControls;
|
||||||
|
|
||||||
|
@ -33,9 +33,12 @@ uses
|
|||||||
// To get as little as posible circles,
|
// To get as little as posible circles,
|
||||||
// uncomment only when needed for registration
|
// 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,
|
Win32Extra, Win32Int, Win32Proc, InterfaceBase,
|
||||||
////////////////////////////////////////////////////
|
|
||||||
WSImgList, WSLCLClasses, WSProc, WSReferences;
|
WSImgList, WSLCLClasses, WSProc, WSReferences;
|
||||||
|
|
||||||
type
|
type
|
||||||
@ -296,7 +299,7 @@ begin
|
|||||||
// if it is manifested exe then use winXP algoriphm of gray painting
|
// if it is manifested exe then use winXP algoriphm of gray painting
|
||||||
FillChar(DrawParams, SizeOf(DrawParams), 0);
|
FillChar(DrawParams, SizeOf(DrawParams), 0);
|
||||||
DrawParams.cbSize := SizeOf(DrawParams);
|
DrawParams.cbSize := SizeOf(DrawParams);
|
||||||
DrawParams.himlL := AList.Reference._Handle;
|
DrawParams.himl := AList.Reference._Handle;
|
||||||
DrawParams.i := AIndex;
|
DrawParams.i := AIndex;
|
||||||
DrawParams.hdcDst := ADC;
|
DrawParams.hdcDst := ADC;
|
||||||
DrawParams.x := ABounds.Left;
|
DrawParams.x := ABounds.Left;
|
||||||
|
Loading…
Reference in New Issue
Block a user