From cf1c8283aca6d09ddfc42d18c8ecc38bbc0f65fb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 16 Sep 2014 14:02:41 +0000 Subject: MS_CLIST_REMOVEMAINMENUITEM also removed git-svn-id: http://svn.miranda-ng.org/main/trunk@10480 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AddContactPlus/src/main.cpp | 2 +- plugins/BossKeyPlus/src/BossKey.cpp | 2 +- plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp | 4 ++-- plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp | 2 +- plugins/ListeningTo/src/listeningto.cpp | 4 ++-- plugins/QuickSearch/sr_global.pas | 5 ++--- plugins/TrafficCounter/src/TrafficCounter.cpp | 2 +- plugins/TrafficCounter/src/options.cpp | 2 +- plugins/UserInfoEx/src/psp_options.cpp | 18 ++++++++---------- plugins/Watrack/lastfm/lastfm.pas | 2 +- plugins/Watrack/popup/popups.pas | 2 +- plugins/Watrack/stat/statlog.pas | 2 +- plugins/mRadio/i_tray.inc | 4 ++-- 13 files changed, 24 insertions(+), 27 deletions(-) (limited to 'plugins') diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index 2458b59076..df317a48c2 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -102,7 +102,7 @@ static int OnAccListChanged(WPARAM, LPARAM) if (!hMainMenuItem) return 0; - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hMainMenuItem, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hMainMenuItem, 0); CallService(MS_TTB_REMOVEBUTTON, (WPARAM)hToolBarItem, 0); hMainMenuItem = 0; } diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 3be8c1a081..fa3cdf2e41 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -562,7 +562,7 @@ void BossKeyMenuItemInit(void) // Add menu item void BossKeyMenuItemUnInit(void) // Remove menu item { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)g_hMenuItem, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)g_hMenuItem, 0); g_hMenuItem = 0; } diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp index a4acecf17e..599a4f9d88 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp @@ -1706,7 +1706,7 @@ static int CLUIFramesLoadMainMenu() return -1; if (_hmiRoot != HGENMENU_ROOT) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)_hmiRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)_hmiRoot, 0); _hmiRoot = HGENMENU_ROOT; } @@ -3870,7 +3870,7 @@ static INT_PTR UnloadMainMenu() { CLUIFrameOnModulesUnload(0, 0); if (_hmiRoot != HGENMENU_ROOT) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)_hmiRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)_hmiRoot, 0); _hmiRoot = HGENMENU_ROOT; } diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp index f850e92d61..6fe8fffc31 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp @@ -1473,7 +1473,7 @@ static int CLUIFramesLoadMainMenu() return -1; if (MainMIRoot != (HANDLE)-1) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)MainMIRoot, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)MainMIRoot, 0); MainMIRoot = (HGENMENU)-1; } diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index 7dcceb47b1..f6fd9214c7 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -188,7 +188,7 @@ void RebuildMenu() ProtocolInfo *info = &proto_items[i]; if (info->hMenu != NULL) - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM) info->hMenu, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM) info->hMenu, 0); TCHAR text[512]; mir_sntprintf(text, SIZEOF(text), TranslateT("Send to %s"), info->account); @@ -252,7 +252,7 @@ int AccListChanged(WPARAM wParam, LPARAM lParam) } else if (wParam == PRAC_REMOVED || (wParam == PRAC_CHECKED && !proto->bIsEnabled)) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM) info->hMenu, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM) info->hMenu, 0); for(std::vector::iterator it = proto_items.begin(); it != proto_items.end(); ++it) { diff --git a/plugins/QuickSearch/sr_global.pas b/plugins/QuickSearch/sr_global.pas index 41d8eaa368..955c18e692 100644 --- a/plugins/QuickSearch/sr_global.pas +++ b/plugins/QuickSearch/sr_global.pas @@ -264,10 +264,9 @@ begin begin { - if (MainMenuItem<>0) and - (ServiceExists(MS_CLIST_REMOVEMAINMENUITEM)<>0) then + if (MainMenuItem<>0) then begin - CallService(MS_CLIST_REMOVEMAINMENUITEM,MainMenuItem,0); + CallService(MO_REMOVEMENUITEM,MainMenuItem,0); MainMenuItem:=0; end; } diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index 9db8c5dd71..342a5557a9 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -158,7 +158,7 @@ int TrafficCounterShutdown(WPARAM wParam, LPARAM lParam) // Удаляем пункт главного меню. if (hTrafficMainMenuItem) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hTrafficMainMenuItem, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hTrafficMainMenuItem, 0); hTrafficMainMenuItem = NULL; } // Удаляем контекстное меню. diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp index f545961c02..d01ac44276 100644 --- a/plugins/TrafficCounter/src/options.cpp +++ b/plugins/TrafficCounter/src/options.cpp @@ -324,7 +324,7 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, // Если отключается показ пункта главного меню, то удаляем его. if (!unOptions.ShowMainMenuItem && hTrafficMainMenuItem) { - CallService(MS_CLIST_REMOVEMAINMENUITEM, (WPARAM)hTrafficMainMenuItem, 0); + CallService(MO_REMOVEMENUITEM, (WPARAM)hTrafficMainMenuItem, 0); hTrafficMainMenuItem = NULL; } // Если включается, то создаём. diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index dc9d584a11..5db6f1418c 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -359,19 +359,17 @@ static INT_PTR CALLBACK DlgProc_CommonOpts(HWND hDlg, UINT uMsg, WPARAM wParam, case CHECK_OPT_MI_GROUP: case CHECK_OPT_MI_SUBGROUP: case CHECK_OPT_MI_ACCOUNT: - { - for (int i = 0; i < SIZEOF(ctrl_Menu); i++) { - if (ctrl_Menu[i].idCheckbox == LOWORD(wParam)) { - const int idMenuItems[] = { ctrl_Menu[i].idCheckbox + 1, ctrl_Menu[i].idNONE, ctrl_Menu[i].idALL, ctrl_Menu[i].idEXIMPORT }; - EnableControls(hDlg, idMenuItems, SIZEOF(idMenuItems), - Button_GetCheck((HWND)lParam) && ServiceExists(MS_CLIST_REMOVEMAINMENUITEM)); - break; - } + for (int i = 0; i < SIZEOF(ctrl_Menu); i++) { + if (ctrl_Menu[i].idCheckbox == LOWORD(wParam)) { + const int idMenuItems[] = { ctrl_Menu[i].idCheckbox + 1, ctrl_Menu[i].idNONE, ctrl_Menu[i].idALL, ctrl_Menu[i].idEXIMPORT }; + EnableControls(hDlg, idMenuItems, SIZEOF(idMenuItems), Button_GetCheck((HWND)lParam)); + break; } - if (bInitialized) - NotifyParentOfChange(hDlg); } + if (bInitialized) + NotifyParentOfChange(hDlg); break; + case RADIO_OPT_MI_MAIN_ALL: case RADIO_OPT_MI_MAIN_NONE: case RADIO_OPT_MI_MAIN_EXIMPORT: diff --git a/plugins/Watrack/lastfm/lastfm.pas b/plugins/Watrack/lastfm/lastfm.pas index 6d50b68d14..ee552cc00e 100644 --- a/plugins/Watrack/lastfm/lastfm.pas +++ b/plugins/Watrack/lastfm/lastfm.pas @@ -261,7 +261,7 @@ begin else DestroyServiceFunction(slastinf); - CallService(MS_CLIST_REMOVEMAINMENUITEM,hMenuLast,0); + CallService(MO_REMOVEMENUITEM,hMenuLast,0); hMenuLast:=0; DestroyServiceFunction(slast); UnhookEvent(plStatusHook); diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas index 67ac946579..212409324e 100644 --- a/plugins/Watrack/popup/popups.pas +++ b/plugins/Watrack/popup/popups.pas @@ -540,7 +540,7 @@ begin if aSetDisable then SetModStatus(0); - CallService(MS_CLIST_REMOVEMAINMENUITEM,hMenuInfo,0); + CallService(MO_REMOVEMENUITEM,hMenuInfo,0); UnhookEvent(plStatusHook); DestroyServiceFunction(ssmi); UnhookEvent(sic); diff --git a/plugins/Watrack/stat/statlog.pas b/plugins/Watrack/stat/statlog.pas index d5a0318a69..5ff486747c 100644 --- a/plugins/Watrack/stat/statlog.pas +++ b/plugins/Watrack/stat/statlog.pas @@ -615,7 +615,7 @@ begin if aSetDisable then SetModStatus(0); - CallService(MS_CLIST_REMOVEMAINMENUITEM,hMenuReport,0); + CallService(MO_REMOVEMENUITEM,hMenuReport,0); UnhookEvent(plStatusHook); UnhookEvent(sic); DestroyServiceFunction(hPackLog); diff --git a/plugins/mRadio/i_tray.inc b/plugins/mRadio/i_tray.inc index 103865ffe5..02d1ae5fd8 100644 --- a/plugins/mRadio/i_tray.inc +++ b/plugins/mRadio/i_tray.inc @@ -85,7 +85,7 @@ begin if doTray then CallService(MS_CLIST_REMOVETRAYMENUITEM,tmp.menuitem,0) else - CallService(MS_CLIST_REMOVEMAINMENUITEM,tmp.menuitem,0); + CallService(MO_REMOVEMENUITEM,tmp.menuitem,0); mFreeMem(tmp); List_Remove(@trayStations,i); end; @@ -317,5 +317,5 @@ begin if doTray then CallService(MS_CLIST_REMOVETRAYMENUITEM,trayradioparent,0) else - CallService(MS_CLIST_REMOVEMAINMENUITEM,trayradioparent,0); + CallService(MO_REMOVEMENUITEM,trayradioparent,0); end; -- cgit v1.2.3