diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-14 15:51:34 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-14 15:51:34 +0000 |
| commit | e58823d961a630eb62e60d2ccb443761ba5f1704 (patch) | |
| tree | 62d071be480d57af2a53f154a1468abe0b9449ff /plugins/Alarms | |
| parent | 721aea0764451e985d575236205808bbef298244 (diff) | |
- all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs.
- massive cleanup of the menu-related code
git-svn-id: http://svn.miranda-ng.org/main/trunk@410 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Alarms')
| -rw-r--r-- | plugins/Alarms/frame.cpp | 18 | ||||
| -rw-r--r-- | plugins/Alarms/options.cpp | 24 |
2 files changed, 20 insertions, 22 deletions
diff --git a/plugins/Alarms/frame.cpp b/plugins/Alarms/frame.cpp index e298cae41d..cc36c3bc86 100644 --- a/plugins/Alarms/frame.cpp +++ b/plugins/Alarms/frame.cpp @@ -567,17 +567,17 @@ int CreateFrame() // create menu item
CreateServiceFunction(MODULE "/ShowHideReminders", ShowHideMenuFunc);
- CLISTMENUITEM menu = {0};
+ CLISTMENUITEM mi = {0};
- menu.cbSize=sizeof(menu);
- menu.flags = CMIM_ALL;
+ mi.cbSize=sizeof(mi);
+ mi.flags = CMIM_ALL;
- menu.hIcon=hIconMenuShowHide;
- menu.pszName = Translate("Show Reminders");
- menu.pszService= MODULE "/ShowHideReminders";
- menu.pszPopupName = Translate("Alarms");
- menu.position = 500010000;
- hMenuShowReminders = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&menu);
+ mi.hIcon=hIconMenuShowHide;
+ mi.pszName = Translate("Show Reminders");
+ mi.pszService= MODULE "/ShowHideReminders";
+ mi.pszPopupName = Translate("Alarms");
+ mi.position = 500010000;
+ hMenuShowReminders = Menu_AddMainMenuItem(&mi);
/////////////////////
if (!options.auto_showhide) {
diff --git a/plugins/Alarms/options.cpp b/plugins/Alarms/options.cpp index 4b6076e6bb..9f2b9d1222 100644 --- a/plugins/Alarms/options.cpp +++ b/plugins/Alarms/options.cpp @@ -696,22 +696,20 @@ void AddMenuItem() {
if (hMainMenuItem) return;
- CLISTMENUITEM menu = {0};
-
- menu.cbSize=sizeof(menu);
- menu.flags = CMIM_ALL;
- menu.hIcon=hIconMenuSet;
-
- menu.pszName = Translate("Set Alarm");
- menu.pszService= MODULE "/NewAlarm";
- menu.position = 500010000;
+ CLISTMENUITEM mi = {0};
+ mi.cbSize = sizeof(mi);
+ mi.flags = CMIM_ALL;
+ mi.hIcon = hIconMenuSet;
+ mi.pszName = "Set Alarm";
+ mi.pszService = MODULE "/NewAlarm";
+ mi.position = 500010000;
if (!ServiceExists(MS_CLIST_FRAMES_ADDFRAME))
- menu.pszPopupName = Translate("Alarms");
- if (ServiceExists(MS_CLIST_ADDGROUPMENUITEM)) {
+ mi.pszPopupName = "Alarms";
+ if (ServiceExists(MS_CLIST_REMOVEGROUPMENUITEM)) {
GroupMenuParam gmp = {0};
- hGroupMenuItem = (HANDLE)CallService(MS_CLIST_ADDGROUPMENUITEM,(WPARAM)&gmp,(LPARAM)&menu);
+ hGroupMenuItem = Menu_AddGroupMenuItem(&gmp, &mi);
}
- hMainMenuItem = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&menu);
+ hMainMenuItem = Menu_AddMainMenuItem(&mi);
}
///////////////////////
|