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 /src/core | |
| 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 'src/core')
| -rw-r--r-- | src/core/stdchat/src/services.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdemail/email.cpp | 1 | ||||
| -rw-r--r-- | src/core/stdfile/file.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdhelp/help.cpp | 1 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgs.cpp | 2 | ||||
| -rw-r--r-- | src/core/stduihist/history.cpp | 1 | ||||
| -rw-r--r-- | src/core/stdurl/url.cpp | 1 | ||||
| -rw-r--r-- | src/core/stduserinfo/userinfo.cpp | 1 |
8 files changed, 3 insertions, 10 deletions
diff --git a/src/core/stdchat/src/services.cpp b/src/core/stdchat/src/services.cpp index 6a2cc1db9a..a57293814c 100644 --- a/src/core/stdchat/src/services.cpp +++ b/src/core/stdchat/src/services.cpp @@ -761,7 +761,7 @@ static int ModulesLoaded(WPARAM wParam,LPARAM lParam) {
CLISTMENUITEM mi = { sizeof(mi) };
mi.position = -2000090001;
- mi.flags = CMIF_DEFAULT | CMIF_ICONFROMICOLIB;
+ mi.flags = CMIF_DEFAULT;
mi.icolibItem = LoadSkinnedIconHandle( SKINICON_CHAT_JOIN );
mi.pszName = LPGEN("&Join");
mi.pszService = "GChat/JoinChat";
@@ -769,7 +769,7 @@ static int ModulesLoaded(WPARAM wParam,LPARAM lParam) mi.position = -2000090000;
mi.icolibItem = LoadSkinnedIconHandle( SKINICON_CHAT_LEAVE );
- mi.flags = CMIF_NOTOFFLINE | CMIF_ICONFROMICOLIB;
+ mi.flags = CMIF_NOTOFFLINE;
mi.pszName = LPGEN("&Leave");
mi.pszService = "GChat/LeaveChat";
hLeaveMenuItem = Menu_AddContactMenuItem(&mi);
diff --git a/src/core/stdemail/email.cpp b/src/core/stdemail/email.cpp index 95f772884b..3d8ffc470c 100644 --- a/src/core/stdemail/email.cpp +++ b/src/core/stdemail/email.cpp @@ -67,7 +67,6 @@ int LoadSendRecvEMailModule(void) {
CLISTMENUITEM mi = { sizeof(mi) };
mi.position = -2000010000;
- mi.flags = CMIF_ICONFROMICOLIB;
mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_SENDEMAIL);
mi.pszName = LPGEN("&E-mail");
mi.pszService = MS_EMAIL_SENDEMAIL;
diff --git a/src/core/stdfile/file.cpp b/src/core/stdfile/file.cpp index 8e67d7f802..292eb13873 100644 --- a/src/core/stdfile/file.cpp +++ b/src/core/stdfile/file.cpp @@ -325,7 +325,6 @@ static int SRFileModulesLoaded(WPARAM, LPARAM) mi.icolibItem = GetSkinIconHandle(SKINICON_EVENT_FILE);
mi.pszName = LPGEN("&File");
mi.pszService = MS_FILE_SENDFILE;
- mi.flags = CMIF_ICONFROMICOLIB;
hSRFileMenuItem = Menu_AddContactMenuItem(&mi);
RemoveUnreadFileEvents();
@@ -419,7 +418,6 @@ int LoadSendRecvFileModule(void) CreateServiceFunction("FtMgr/Show", FtMgrShowCommand);
CLISTMENUITEM mi = { sizeof(mi) };
- mi.flags = CMIF_ICONFROMICOLIB;
mi.icolibItem = GetSkinIconHandle(SKINICON_EVENT_FILE);
mi.position = 1900000000;
mi.pszName = LPGEN("File &Transfers...");
diff --git a/src/core/stdhelp/help.cpp b/src/core/stdhelp/help.cpp index 86ce15e997..4440aece1f 100644 --- a/src/core/stdhelp/help.cpp +++ b/src/core/stdhelp/help.cpp @@ -86,7 +86,6 @@ int LoadHelpModule(void) SetHookDefaultForHookableEvent(hBugEvent, BugCommandEvent);
CLISTMENUITEM mi = { sizeof(mi) };
- mi.flags = CMIF_ICONFROMICOLIB;
mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_MIRANDA);
mi.pszPopupName = LPGEN("&Help");
mi.popupPosition = 2000090000;
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 61ed781665..ba8063ea65 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -301,7 +301,7 @@ static int SplitmsgModulesLoaded(WPARAM wParam, LPARAM lParam) {
CLISTMENUITEM mi = { sizeof(mi) };
mi.position = -2000090000;
- mi.flags = CMIF_ICONFROMICOLIB | CMIF_DEFAULT;
+ mi.flags = CMIF_DEFAULT;
mi.icolibItem = LoadSkinnedIconHandle( SKINICON_EVENT_MESSAGE );
mi.pszName = LPGEN("&Message");
mi.pszService = MS_MSG_SENDMESSAGE;
diff --git a/src/core/stduihist/history.cpp b/src/core/stduihist/history.cpp index da39ccaee2..e21e9cf21f 100644 --- a/src/core/stduihist/history.cpp +++ b/src/core/stduihist/history.cpp @@ -406,7 +406,6 @@ int LoadHistoryModule(void) {
CLISTMENUITEM mi = { sizeof(mi) };
mi.position = 1000090000;
- mi.flags = CMIF_ICONFROMICOLIB;
mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_HISTORY);
mi.pszName = LPGEN("View &History");
mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY;
diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp index 945cdefabe..ff4d8ec72a 100644 --- a/src/core/stdurl/url.cpp +++ b/src/core/stdurl/url.cpp @@ -122,7 +122,6 @@ static int SRUrlModulesLoaded(WPARAM, LPARAM) {
CLISTMENUITEM mi = { sizeof(mi) };
mi.position = -2000040000;
- mi.flags = CMIF_ICONFROMICOLIB;
mi.icolibItem = GetSkinIconHandle(SKINICON_EVENT_URL);
mi.pszName = LPGEN("Web Page Address (&URL)");
mi.pszService = MS_URL_SENDURL;
diff --git a/src/core/stduserinfo/userinfo.cpp b/src/core/stduserinfo/userinfo.cpp index d9bf4050b3..152b4b34b3 100644 --- a/src/core/stduserinfo/userinfo.cpp +++ b/src/core/stduserinfo/userinfo.cpp @@ -636,7 +636,6 @@ int LoadUserInfoModule(void) HookEvent(ME_SYSTEM_PRESHUTDOWN, ShutdownUserInfo);
CLISTMENUITEM mi = { sizeof(mi) };
- mi.flags = CMIF_ICONFROMICOLIB;
mi.position = 1000050000;
mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_USERDETAILS);
mi.pszName = LPGEN("User &Details");
|