diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-16 15:29:56 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-16 15:29:56 +0000 |
| commit | 2def8505c21d5f20a845a90992629d072fd7250a (patch) | |
| tree | 2d80abd833aa68bfc3018fe29a218921f69cb257 /src/mir_core | |
| parent | 108e6336657baa03d86659944b1e96c201379ac5 (diff) | |
- all name conflicts in the core fixed;
- some 64-bit issues fixed
git-svn-id: http://svn.miranda-ng.org/main/trunk@14966 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/mir_core')
| -rw-r--r-- | src/mir_core/src/icons.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mir_core/src/icons.cpp b/src/mir_core/src/icons.cpp index 928bf99fa0..9b4e874174 100644 --- a/src/mir_core/src/icons.cpp +++ b/src/mir_core/src/icons.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
-MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char *szSection, IconItem *pIcons, size_t iCount, char *prefix, int hLangpack)
+MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char *szSection, IconItem *pIcons, size_t iCount, char *prefix, int _hLang)
{
TCHAR szFile[MAX_PATH];
GetModuleFileName(hInst, szFile, MAX_PATH);
@@ -44,11 +44,11 @@ MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char *szSection, IconIte sid.cx = sid.cy = pIcons[i].size;
sid.description.a = pIcons[i].szDescr;
sid.iDefaultIndex = -pIcons[i].defIconID;
- pIcons[i].hIcolib = IcoLib_AddIcon(&sid, hLangpack);
+ pIcons[i].hIcolib = IcoLib_AddIcon(&sid, _hLang);
}
}
-MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const TCHAR *szSection, IconItemT *pIcons, size_t iCount, char *prefix, int hLangpack)
+MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const TCHAR *szSection, IconItemT *pIcons, size_t iCount, char *prefix, int _hLang)
{
TCHAR szFile[MAX_PATH];
GetModuleFileName(hInst, szFile, MAX_PATH);
@@ -69,6 +69,6 @@ MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const TCHAR *szSection, IconI sid.cx = sid.cy = pIcons[i].size;
sid.description.t = pIcons[i].tszDescr;
sid.iDefaultIndex = -pIcons[i].defIconID;
- pIcons[i].hIcolib = IcoLib_AddIcon(&sid, hLangpack);
+ pIcons[i].hIcolib = IcoLib_AddIcon(&sid, _hLang);
}
}
|