hLangpack variable began migration inside CMPluginBase

it remains existing for now, but as reference to g_plugin.m_hLang

2 files changed, 8 insertions, 6 deletions

diff --git a/include/m_core.h b/include/m_core.h
index 2b85a8e36c..7f01dab6a2 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -62,6 +62,8 @@ extern "C"
 {

 #endif

 

+extern int &hLangpack; // gotta be killed soon

+

 ///////////////////////////////////////////////////////////////////////////////

 // command line support

 

@@ -153,8 +155,6 @@ MIR_CORE_DLL(char*) mir_urlEncode(const char *szUrl);
 ///////////////////////////////////////////////////////////////////////////////

 // icons support

 

-extern int hLangpack;

-

 typedef struct tagIconItem

 {

 	char  *szDescr, *szName;

@@ -173,11 +173,11 @@ typedef struct tagIconItemT
 	IconItemT;

 

 #if defined( __cplusplus )

-MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char* szSection, IconItem* pIcons, size_t iCount, char *prefix = nullptr, int = hLangpack);

-MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const wchar_t* szSection, IconItemT* pIcons, size_t iCount, char *prefix = nullptr, int = hLangpack);

+MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char* szSection, IconItem* pIcons, size_t iCount, const char *prefix = nullptr, int = hLangpack);

+MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const wchar_t* szSection, IconItemT* pIcons, size_t iCount, const char *prefix = nullptr, int = hLangpack);

 #else

-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_RegisterT(HINSTANCE hInst, const wchar_t* szSection, IconItemT* pIcons, size_t iCount, char *prefix, int hLangpack);

+MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char* szSection, IconItem* pIcons, size_t iCount, const char *prefix, int hLangpack);

+MIR_CORE_DLL(void) Icon_RegisterT(HINSTANCE hInst, const wchar_t* szSection, IconItemT* pIcons, size_t iCount, const char *prefix, int hLangpack);

 #endif

 

 ///////////////////////////////////////////////////////////////////////////////

diff --git a/include/newpluginapi.h b/include/newpluginapi.h
index c7c8f37a42..b85f489505 100644
--- a/include/newpluginapi.h
+++ b/include/newpluginapi.h
@@ -169,6 +169,8 @@ protected:
 	void SetUniqueId(const char *pszUniqueId);

 

 public:

+	int m_hLang;

+

 	void debugLogA(LPCSTR szFormat, ...);

 	void debugLogW(LPCWSTR wszFormat, ...);