diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-04-06 23:05:29 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-04-06 23:05:29 +0000 |
| commit | 6640a8f419a9ef61ad7af41a419615c2d07b872e (patch) | |
| tree | 6dfecb48ccc82c0c372ced9be59255c7408ebafd /plugins/Clist_nicer/src/CLUIFrames | |
| parent | 06823b967ab360de98fa2c9e685695e1dff6f78a (diff) | |
menu item flag CMIF_ICONFROMICOLIB is ignored by the core from now on
git-svn-id: http://svn.miranda-ng.org/main/trunk@4354 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_nicer/src/CLUIFrames')
| -rw-r--r-- | plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp | 4 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp index 052ef37f2d..e371374fe7 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp @@ -648,7 +648,7 @@ HMENU CLUIFramesCreateMenuForFrame(int frameid, int root, int popuppos, HGENMENU mi.popupPosition = frameid;
mi.position = popuppos++;
mi.pszName = LPGEN("&FrameTitle");
- mi.flags = CMIF_CHILDPOPUP | CMIF_GRAYED | CMIF_ICONFROMICOLIB;
+ mi.flags = CMIF_CHILDPOPUP | CMIF_GRAYED;
mi.pszContactOwner = 0;
menuid = pfnAdd(&mi);
if (frameid == -1) contMITitle = menuid;
@@ -1599,7 +1599,7 @@ static int CLUIFramesLoadMainMenu() // create root menu
CLISTMENUITEM mi = { sizeof(mi) };
mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_FRAME);
- mi.flags = CMIF_ROOTHANDLE | CMIF_ICONFROMICOLIB;
+ mi.flags = CMIF_ROOTHANDLE;
mi.position = 3000090000;
mi.pszPopupName = (char*) - 1;
mi.pszName = LPGEN("Frames");
diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp index fd261b6f6a..2bb67ac6c4 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp @@ -315,7 +315,6 @@ void InitGroupMenus(void) memset(&mi,0,sizeof(mi));
mi.cbSize=sizeof(mi);
mi.position=200000;
- mi.flags = CMIF_ICONFROMICOLIB;
mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_FINDUSER); //LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_FINDUSER));
mi.pszService="FindAdd/FindAddCommand";
mi.pszName=LPGEN("&Find/Add Contacts...");
@@ -345,7 +344,6 @@ void InitGroupMenus(void) memset(&mi,0,sizeof(mi));
mi.cbSize=sizeof(mi);
mi.position=400000;
- mi.flags = CMIF_ICONFROMICOLIB;
mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_OPTIONS); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_OPTIONS));
mi.pszService="Options/OptionsCommand";
mi.pszName=LPGEN("&Options...");
@@ -355,7 +353,6 @@ void InitGroupMenus(void) memset(&mi,0,sizeof(mi));
mi.cbSize=sizeof(mi);
mi.position=500000;
- mi.flags = CMIF_ICONFROMICOLIB;
mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_MIRANDA); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_MIRANDA));
mi.pszService="CLN/About";
mi.pszName=LPGEN("&About the contact list...");
@@ -637,7 +634,6 @@ void InitSubGroupMenus(void) memset(&mi,0,sizeof(mi));
mi.cbSize=sizeof(mi);
mi.position=900001;
- mi.flags = CMIF_ICONFROMICOLIB;
mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_RENAME); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_RENAME));
mi.pszService="CLISTMENUSSubGroup/GroupMenuExecProxy";
mi.pszName=LPGEN("&Rename Group");
@@ -647,7 +643,6 @@ void InitSubGroupMenus(void) memset(&mi,0,sizeof(mi));
mi.cbSize=sizeof(mi);
mi.position=900002;
- mi.flags = CMIF_ICONFROMICOLIB;
mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_DELETE); //LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_DELETE));
mi.pszService="CLISTMENUSSubGroup/GroupMenuExecProxy";
mi.pszName=LPGEN("&Delete Group");
|