diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-29 19:30:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-29 19:30:51 +0000 |
| commit | ee3100701b64a1a34e8e5b3069219c7c5a201d8a (patch) | |
| tree | 65ae99da9575d2611734482dcedec21bf7f186db /src/core | |
| parent | cadd3f86302d30d6d6a2e4af63a7a50f0dd1f1cb (diff) | |
- unified menu creation using wrapper class CMenuItem;
- duplicated hLangpack field removed from TMO_IntMenuItem;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14440 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdaway/src/awaymsg.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdemail/src/email.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdfile/src/file.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdhelp/src/help.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgs.cpp | 2 | ||||
| -rw-r--r-- | src/core/stduihist/src/history.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdurl/url.cpp | 2 | ||||
| -rw-r--r-- | src/core/stduserinfo/src/userinfo.cpp | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/core/stdaway/src/awaymsg.cpp b/src/core/stdaway/src/awaymsg.cpp index 15ac55f682..8ffae1df96 100644 --- a/src/core/stdaway/src/awaymsg.cpp +++ b/src/core/stdaway/src/awaymsg.cpp @@ -167,7 +167,7 @@ int LoadAwayMsgModule(void) hWindowList = WindowList_Create();
CreateServiceFunction(MS_AWAYMSG_SHOWAWAYMSG, GetMessageCommand);
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.position = -2000005000;
mi.flags = CMIF_NOTOFFLINE;
mi.name.a = LPGEN("Re&ad status message");
diff --git a/src/core/stdemail/src/email.cpp b/src/core/stdemail/src/email.cpp index 42009eb606..719983ec67 100644 --- a/src/core/stdemail/src/email.cpp +++ b/src/core/stdemail/src/email.cpp @@ -66,7 +66,7 @@ static int EMailPreBuildMenu(WPARAM hContact, LPARAM) int LoadSendRecvEMailModule(void)
{
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.position = -2000010000;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_SENDEMAIL);
mi.name.a = LPGEN("&E-mail");
diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp index 397034f2a9..39ada96555 100644 --- a/src/core/stdfile/src/file.cpp +++ b/src/core/stdfile/src/file.cpp @@ -336,7 +336,7 @@ static int SRFileProtoAck(WPARAM, LPARAM lParam) static int SRFileModulesLoaded(WPARAM, LPARAM)
{
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.position = -2000020000;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);
mi.name.a = LPGEN("&File");
@@ -434,7 +434,7 @@ int LoadSendRecvFileModule(void) {
CreateServiceFunction("FtMgr/Show", FtMgrShowCommand);
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);
mi.position = 1900000000;
mi.name.a = LPGEN("File &transfers...");
diff --git a/src/core/stdhelp/src/help.cpp b/src/core/stdhelp/src/help.cpp index d248c24d45..121a097757 100644 --- a/src/core/stdhelp/src/help.cpp +++ b/src/core/stdhelp/src/help.cpp @@ -73,7 +73,7 @@ int LoadHelpModule(void) CreateServiceFunction("Help/WebsiteCommand", WebsiteCommand);
CreateServiceFunction("Help/BugCommand", BugCommand);
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.root = Menu_CreateRoot(MO_MAIN, LPGENT("&Help"), 2000090000);
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDA);
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 3319d29fb2..c433236f35 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -278,7 +278,7 @@ static int SplitmsgModulesLoaded(WPARAM, LPARAM) RegisterSRMMFonts();
LoadMsgLogIcons();
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.position = -2000090000;
mi.flags = CMIF_DEFAULT;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_MESSAGE);
diff --git a/src/core/stduihist/src/history.cpp b/src/core/stduihist/src/history.cpp index 2114cd2e24..edc96772ba 100644 --- a/src/core/stduihist/src/history.cpp +++ b/src/core/stduihist/src/history.cpp @@ -401,7 +401,7 @@ static int PreShutdownHistoryModule(WPARAM, LPARAM) int LoadHistoryModule(void)
{
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.position = 1000090000;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);
mi.name.a = LPGEN("View &history");
diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp index ba9bd8bb14..c0c0a34829 100644 --- a/src/core/stdurl/url.cpp +++ b/src/core/stdurl/url.cpp @@ -119,7 +119,7 @@ static int SRUrlPreBuildMenu(WPARAM wParam, LPARAM) static int SRUrlModulesLoaded(WPARAM, LPARAM)
{
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.position = -2000040000;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);
mi.name.a = LPGEN("Web page address (&URL)");
diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp index e4019fe568..40cbe871ef 100644 --- a/src/core/stduserinfo/src/userinfo.cpp +++ b/src/core/stduserinfo/src/userinfo.cpp @@ -628,7 +628,7 @@ int LoadUserInfoModule(void) HookEvent(ME_DB_CONTACT_DELETED, UserInfoContactDelete);
HookEvent(ME_SYSTEM_PRESHUTDOWN, ShutdownUserInfo);
- TMO_MenuItem mi = { 0 };
+ CMenuItem mi;
mi.position = 1000050000;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);
mi.name.a = LPGEN("User &details");
|