* made RT_* simple constants, fixes #8584

git-svn-id: trunk@7052 -
This commit is contained in:
florian 2007-04-01 15:39:45 +00:00
parent f2c81869a1
commit 8d371e3f97
3 changed files with 40 additions and 168 deletions

View File

@ -337,6 +337,10 @@
Macros Macros
} }
MakeIntResourceA = PAnsiChar;
MakeIntResourceW = PWideChar;
MakeIntResource = MakeIntResourceA;
{ was #define dname(params) def_expr } { was #define dname(params) def_expr }
{ argument types are unknown } { argument types are unknown }
function GetBValue(rgb : longint) : BYTE; function GetBValue(rgb : longint) : BYTE;
@ -415,10 +419,6 @@
{ argument types are unknown } { argument types are unknown }
function MAKEINTATOM(i : longint) : LPTSTR; function MAKEINTATOM(i : longint) : LPTSTR;
{ was #define dname(params) def_expr }
{ argument types are unknown }
function MAKEINTRESOURCE(i : longint) : LPTSTR;
{ was #define dname(params) def_expr } { was #define dname(params) def_expr }
{ argument types are unknown } { argument types are unknown }
{ return type might be wrong } { return type might be wrong }
@ -825,12 +825,6 @@ type
MAKEINTATOM:=LPTSTR(ULONG_PTR(WORD(i))); MAKEINTATOM:=LPTSTR(ULONG_PTR(WORD(i)));
end; end;
{ was #define dname(params) def_expr }
{ argument types are unknown }
function MAKEINTRESOURCE(i : longint) : LPTSTR;
begin
MAKEINTRESOURCE:=LPTSTR(ULONG_PTR(WORD(i)));
end;
{ was #define dname(params) def_expr } { was #define dname(params) def_expr }
{ argument types are unknown } { argument types are unknown }

View File

@ -1139,61 +1139,37 @@
{ EnumPrinters } { EnumPrinters }
{ EnumProtocols } { EnumProtocols }
{ EnumResLangProc } { EnumResLangProc }
{ was #define dname def_expr }
function RT_ACCELERATOR : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_BITMAP : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr } //
function RT_DIALOG : LPTSTR; // Predefined Resource Types
{ return type might be wrong } //
const
RT_CURSOR = MAKEINTRESOURCE(1);
RT_BITMAP = MAKEINTRESOURCE(2);
RT_ICON = MAKEINTRESOURCE(3);
RT_MENU = MAKEINTRESOURCE(4);
RT_DIALOG = MAKEINTRESOURCE(5);
RT_STRING = MAKEINTRESOURCE(6);
RT_FONTDIR = MAKEINTRESOURCE(7);
RT_FONT = MAKEINTRESOURCE(8);
RT_ACCELERATOR = MAKEINTRESOURCE(9);
RT_RCDATA = MAKEINTRESOURCE(10);
RT_MESSAGETABLE = MAKEINTRESOURCE(11);
{ was #define dname def_expr } DIFFERENCE = 11;
function RT_FONT : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr } RT_GROUP_CURSOR = MAKEINTRESOURCE(ULONG_PTR(RT_CURSOR) + DIFFERENCE);
function RT_FONTDIR : LPTSTR; RT_GROUP_ICON = MAKEINTRESOURCE(ULONG_PTR(RT_ICON) + DIFFERENCE);
{ return type might be wrong } RT_VERSION = MAKEINTRESOURCE(16);
RT_DLGINCLUDE = MAKEINTRESOURCE(17);
RT_PLUGPLAY = MAKEINTRESOURCE(19);
RT_VXD = MAKEINTRESOURCE(20);
RT_ANICURSOR = MAKEINTRESOURCE(21);
RT_ANIICON = MAKEINTRESOURCE(22);
RT_HTML = MAKEINTRESOURCE(23);
RT_MANIFEST = MAKEINTRESOURCE(24);
{ was #define dname def_expr }
function RT_MENU : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_RCDATA : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_STRING : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_MESSAGETABLE : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_CURSOR : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_GROUP_CURSOR : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_ICON : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_GROUP_ICON : LPTSTR;
{ return type might be wrong }
{ was #define dname def_expr }
function RT_VERSION : LPTSTR;
{ return type might be wrong }
{ EnumServicesStatus } { EnumServicesStatus }
@ -5567,104 +5543,6 @@ const
UNICODE_NULL:=#0; UNICODE_NULL:=#0;
end; end;
{ was #define dname def_expr }
function RT_ACCELERATOR : LPTSTR;
{ return type might be wrong }
begin
RT_ACCELERATOR:=MAKEINTRESOURCE(9);
end;
{ was #define dname def_expr }
function RT_BITMAP : LPTSTR;
{ return type might be wrong }
begin
RT_BITMAP:=MAKEINTRESOURCE(2);
end;
{ was #define dname def_expr }
function RT_DIALOG : LPTSTR;
{ return type might be wrong }
begin
RT_DIALOG:=MAKEINTRESOURCE(5);
end;
{ was #define dname def_expr }
function RT_FONT : LPTSTR;
{ return type might be wrong }
begin
RT_FONT:=MAKEINTRESOURCE(8);
end;
{ was #define dname def_expr }
function RT_FONTDIR : LPTSTR;
{ return type might be wrong }
begin
RT_FONTDIR:=MAKEINTRESOURCE(7);
end;
{ was #define dname def_expr }
function RT_MENU : LPTSTR;
{ return type might be wrong }
begin
RT_MENU:=MAKEINTRESOURCE(4);
end;
{ was #define dname def_expr }
function RT_RCDATA : LPTSTR;
{ return type might be wrong }
begin
RT_RCDATA:=MAKEINTRESOURCE(10);
end;
{ was #define dname def_expr }
function RT_STRING : LPTSTR;
{ return type might be wrong }
begin
RT_STRING:=MAKEINTRESOURCE(6);
end;
{ was #define dname def_expr }
function RT_MESSAGETABLE : LPTSTR;
{ return type might be wrong }
begin
RT_MESSAGETABLE:=MAKEINTRESOURCE(11);
end;
{ was #define dname def_expr }
function RT_CURSOR : LPTSTR;
{ return type might be wrong }
begin
RT_CURSOR:=MAKEINTRESOURCE(1);
end;
{ was #define dname def_expr }
function RT_GROUP_CURSOR : LPTSTR;
{ return type might be wrong }
begin
RT_GROUP_CURSOR:=MAKEINTRESOURCE(12);
end;
{ was #define dname def_expr }
function RT_ICON : LPTSTR;
{ return type might be wrong }
begin
RT_ICON:=MAKEINTRESOURCE(3);
end;
{ was #define dname def_expr }
function RT_GROUP_ICON : LPTSTR;
{ return type might be wrong }
begin
RT_GROUP_ICON:=MAKEINTRESOURCE(13);
end;
{ was #define dname def_expr }
function RT_VERSION : LPTSTR;
{ return type might be wrong }
begin
RT_VERSION:=MAKEINTRESOURCE(16);
end;
{ was #define dname def_expr } { was #define dname def_expr }
function IDC_ARROW : LPTSTR; function IDC_ARROW : LPTSTR;
{ return type might be wrong } { return type might be wrong }