diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-03-10 19:55:33 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-03-10 19:55:33 +0000 |
| commit | 503d82db45bf24f4739d126d43bfbeee4828a882 (patch) | |
| tree | 87b6ec821155e7459af203cde96fc6f9d6104027 /include/delphi/m_helpers.inc | |
| parent | 6ad65c4d4fce1d5ce1a1873ee84feaff753c9d48 (diff) | |
- m_core.inc almost returned back to int_ptr
- another pascal headers merged
git-svn-id: http://svn.miranda-ng.org/main/trunk@3964 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/delphi/m_helpers.inc')
| -rw-r--r-- | include/delphi/m_helpers.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc index 8ea0da211d..b7dcd80bdd 100644 --- a/include/delphi/m_helpers.inc +++ b/include/delphi/m_helpers.inc @@ -25,9 +25,6 @@ function WindowList_Broadcast(hList: THandle; message: int; wParam: WPARAM; lPar function Utils_SaveWindowPosition(hWnd: THandle; hContact: THandle; const szModule, szNamePrefix: PAnsiChar): int_ptr;
function Utils_RestoreWindowPosition(hWnd: THandle; hContact: THandle; Flags: int; const szModule, szNamePrefix: PAnsiChar): int_ptr;
-procedure Icon_Register(hInst:HINST; const szSection:pAnsiChar; pIcons:pIconItem; iCount:size_t; prefix:PAnsiChar=nil);
-procedure Icon_RegisterT(hInst:HINST; const szSection:pWideChar; pIcons:pIconItemW; iCount:size_t; prefix:PAnsiChar=nil);
-
function mir_hashstr(const key:pAnsiChar):uint; {inline;}
function mir_hashstrW(const key:pWideChar):uint; {inline;}
function lrtrim(str:pAnsiChar):pAnsiChar; {inline}
@@ -63,7 +60,10 @@ function Menu_AddTrayMenuItem(mi:PCLISTMENUITEM):HGENMENU; function UserInfo_AddPage(wParam:WPARAM; odp:POPTIONSDIALOGPAGE):int_ptr;
function Options_AddPage(wParam:WPARAM; odp:POPTIONSDIALOGPAGE):int_ptr;
function Hotkey_Register(hk:PHOTKEYDESC):int_ptr;
+
function Skin_AddIcon(si:PSKINICONDESC):THANDLE;
+procedure Icon_Register(hInst:HINST; const szSection:pAnsiChar; pIcons:pIconItem ; iCount:size_t; prefix:PAnsiChar=nil);
+procedure Icon_RegisterW(hInst:HINST; const szSection:pWideChar; pIcons:pIconItemW; iCount:size_t; prefix:PAnsiChar=nil);
procedure FontRegister(pFontID:pFontID);
procedure FontRegisterW(pFontID:pFontIDW);
@@ -470,23 +470,23 @@ begin result:=CallService(MS_SKIN2_ADDICON, hLangpack, LPARAM(si));
end;
-procedure FontRegister(pFontID:pFontID);
+procedure Icon_Register(hInst:HINST; const szSection:pAnsiChar; pIcons:pIconItem; iCount:size_t; prefix:PAnsiChar);
begin
- CallService(MS_FONT_REGISTERA, WPARAM(pFontID), hLangpack);
+ mir_Icon_Register(hInst, szSection, pIcons, iCount, prefix, hLangpack);
end;
-procedure FontRegisterW(pFontID:pFontIDW);
+
+procedure Icon_RegisterW(hInst:HINST; const szSection:pWideChar; pIcons:pIconItemW; iCount:size_t; prefix:PAnsiChar);
begin
- CallService(MS_FONT_REGISTERW, WPARAM(pFontID), hLangpack);
+ mir_Icon_RegisterW(hInst, szSection, pIcons, iCount, prefix, hLangpack);
end;
-procedure Icon_Register(hInst:HINST; const szSection:pAnsiChar; pIcons:pIconItem; iCount:size_t; prefix:PAnsiChar);
+procedure FontRegister(pFontID:pFontID);
begin
- mir_Icon_Register(hInst, szSection, pIcons, iCount, prefix, hLangpack);
+ CallService(MS_FONT_REGISTERA, WPARAM(pFontID), hLangpack);
end;
-
-procedure Icon_RegisterT(hInst:HINST; const szSection:pWideChar; pIcons:pIconItemW; iCount:size_t; prefix:PAnsiChar);
+procedure FontRegisterW(pFontID:pFontIDW);
begin
- mir_Icon_RegisterT(hInst, szSection, pIcons, iCount, prefix, hLangpack);
+ CallService(MS_FONT_REGISTERW, WPARAM(pFontID), hLangpack);
end;
procedure ColourRegister(pColorID:pColourID);
|