From e58823d961a630eb62e60d2ccb443761ba5f1704 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 14 Jun 2012 15:51:34 +0000 Subject: - 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 --- plugins/StatusPlugins/KeepStatus/version.h | 6 ------ plugins/StatusPlugins/StartupStatus/options.cpp | 3 +-- plugins/StatusPlugins/StartupStatus/profiles.cpp | 15 ++++----------- plugins/StatusPlugins/StartupStatus/startupstatus.h | 3 --- 4 files changed, 5 insertions(+), 22 deletions(-) (limited to 'plugins/StatusPlugins') diff --git a/plugins/StatusPlugins/KeepStatus/version.h b/plugins/StatusPlugins/KeepStatus/version.h index 26a301582a..bd3f501a94 100644 --- a/plugins/StatusPlugins/KeepStatus/version.h +++ b/plugins/StatusPlugins/KeepStatus/version.h @@ -1,9 +1,3 @@ -// Set the version number here - it will affect the version resource and the version field of the pluginInfo structure -// (Be careful that you don't have the resource file open when you change this and rebuild, otherwise the changes may not -// take effect within the version resource) -// Do not forget to define symbol "_DEBUG" for resource compiler if you use debug configuration (in VisualStudio you can -// find it under Project properties - Configuration properties - Resource - General - Preprocessor definitions) - // plugin version part #define __MAJOR_VERSION 0 #define __MINOR_VERSION 8 diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp index 91b437f7ed..3aef57390c 100644 --- a/plugins/StatusPlugins/StartupStatus/options.cpp +++ b/plugins/StatusPlugins/StartupStatus/options.cpp @@ -537,8 +537,7 @@ static INT_PTR CALLBACK StatusProfilesOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wP bInitDone = false; TranslateDialogDefault(hwndDlg); - if (ServiceExists(MS_CLIST_ADDSTATUSMENUITEM)) - SetDlgItemText(hwndDlg, IDC_CREATEMMI, TranslateT("Create a status menu item")); + SetDlgItemText(hwndDlg, IDC_CREATEMMI, TranslateT("Create a status menu item")); profileCount = GetProfileCount((WPARAM)&defProfile, 0); if (profileCount == 0) { diff --git a/plugins/StatusPlugins/StartupStatus/profiles.cpp b/plugins/StatusPlugins/StartupStatus/profiles.cpp index 339733b31a..cc98753df6 100644 --- a/plugins/StatusPlugins/StartupStatus/profiles.cpp +++ b/plugins/StatusPlugins/StartupStatus/profiles.cpp @@ -132,17 +132,10 @@ static int CreateMainMenuItems(WPARAM wParam, LPARAM lParam) return 0; } mi.pszService = servicename; - if (ServiceExists(MS_CLIST_ADDSTATUSMENUITEM)) { - if (CallService(MS_CLIST_ADDSTATUSMENUITEM, 0, (LPARAM)&mi)) { - menuprofiles[mcount] = i; - mcount += 1; - } - } - else { - if (CallService(MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi)) { - menuprofiles[mcount] = i; - mcount += 1; - } } } + if (Menu_AddStatusMenuItem(&mi)) { + menuprofiles[mcount] = i; + mcount += 1; + } } return 0; } diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.h b/plugins/StatusPlugins/StartupStatus/startupstatus.h index c1e8e69bb8..0d9a325839 100644 --- a/plugins/StatusPlugins/StartupStatus/startupstatus.h +++ b/plugins/StatusPlugins/StartupStatus/startupstatus.h @@ -127,9 +127,6 @@ typedef struct { #define DOCKED_LEFT 1 #define DOCKED_RIGHT 2 -#ifndef MS_CLIST_ADDSTATUSMENUITEM -#define MS_CLIST_ADDSTATUSMENUITEM "CList/AddStatusMenuItem" -#endif #define MS_SS_MENUSETPROFILEPREFIX "StartupStatus/SetProfile_" // options -- cgit v1.2.3