diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-11 21:32:58 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-11 21:33:11 +0300 |
| commit | f719c8b921c7a46b76453476204224d40c682914 (patch) | |
| tree | c6d92dc450893e7f5abe60c2046ec9c2d1e3db36 /plugins/Clist_nicer | |
| parent | 16ad355c8bdc438c3107ee3ba3ad0bf0b8c395fa (diff) | |
int hLangpack/m_hLang removed and replaced with HPLUGIN
Diffstat (limited to 'plugins/Clist_nicer')
| -rw-r--r-- | plugins/Clist_nicer/src/clcopts.cpp | 4 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/clistmenus.cpp | 2 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/cluiframes.cpp | 8 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/groupmenu.cpp | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index 2268822a7c..87bba912aa 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -513,12 +513,10 @@ static INT_PTR CALLBACK DlgProcIcons(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPar int ClcOptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { 0 };
- odp.hInstance = g_plugin.getInst();
-
////////////////////////////////////////////////////////////////////////////
// Main options tabs
+ OPTIONSDIALOGPAGE odp = {};
odp.position = -1000000000;
odp.flags = ODPF_BOLDGROUPS;
odp.szTitle.a = LPGEN("Contact list");
diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp index a5fd27c1fe..3aba1439c4 100644 --- a/plugins/Clist_nicer/src/clistmenus.cpp +++ b/plugins/Clist_nicer/src/clistmenus.cpp @@ -360,7 +360,7 @@ int InitCustomMenus(void) CreateServiceFunction("CloseAction", CloseAction);
CreateServiceFunction("CList/SetContactIgnore", SetContactIgnore);
- CMenuItem mi(g_plugin);
+ CMenuItem mi(&g_plugin);
SET_UID(mi, 0xe3b08c6f, 0x8a01, 0x4c94, 0xb3, 0xf5, 0x9d, 0x38, 0x6, 0x63, 0x7a, 0xa9);
mi.position = 200000;
mi.pszService = "CList/SetContactIgnore";
diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp index 502d2e8a06..32609d0055 100644 --- a/plugins/Clist_nicer/src/cluiframes.cpp +++ b/plugins/Clist_nicer/src/cluiframes.cpp @@ -553,7 +553,7 @@ int CLUIFramesGetalClientFrame(void) static HGENMENU addFrameMenuItem(TMO_MenuItem *pmi, int frameid, bool bMain) { - pmi->langId = g_plugin.m_hLang; + pmi->pPlugin = &g_plugin; HGENMENU res = (bMain) ? Menu_AddMainMenuItem(pmi) : Menu_AddContextFrameMenuItem(pmi); if (pmi->pszService != nullptr) Menu_ConfigureItem(res, MCI_OPT_EXECPARAM, frameid); @@ -568,7 +568,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, HGENMENU root, int popuppos, boo int framepos = id2pos(frameid); FrameMenuHandles &fmh = (frameid == -1) ? cont : Frames[framepos].MenuHandles; - CMenuItem mi(g_plugin); + CMenuItem mi(&g_plugin); mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDA); mi.root = root; mi.position = popuppos++; @@ -1323,7 +1323,7 @@ static int CLUIFramesLoadMainMenu() g_frameMenus.destroy(); // create frames menu - CMenuItem mi(g_plugin); + CMenuItem mi(&g_plugin); mi.root = cont.MainMenuItem; mi.flags = CMIF_UNICODE | CMIF_SYSTEM; int separator = (int)3000200000; @@ -2937,7 +2937,7 @@ int LoadCLUIFramesModule(void) RegisterClass(&cntclass); // create root menu - CMenuItem mi(g_plugin); + CMenuItem mi(&g_plugin); SET_UID(mi, 0x3931AC4, 0x7A32, 0x4D9C, 0x99, 0x92, 0x94, 0xD4, 0xB5, 0x9B, 0xD6, 0xB6); mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_FRAME); mi.position = 3000090000; diff --git a/plugins/Clist_nicer/src/groupmenu.cpp b/plugins/Clist_nicer/src/groupmenu.cpp index 0d9a351a49..6f5cb4aa83 100644 --- a/plugins/Clist_nicer/src/groupmenu.cpp +++ b/plugins/Clist_nicer/src/groupmenu.cpp @@ -95,7 +95,7 @@ void InitGroupMenus(void) HookEvent(ME_CLIST_PREBUILDGROUPMENU, OnBuildGroupMenu);
- CMenuItem mi(g_plugin);
+ CMenuItem mi(&g_plugin);
SET_UID(mi, 0xe386678a, 0x5aee, 0x4bfa, 0xa8, 0x23, 0xd, 0xa0, 0x11, 0x99, 0xb1, 0x98);
mi.position = 500;
mi.pszService = MS_CLIST_SHOWHIDE;
|