From b7033cda5f3598d477ea37fe2dd343871ae23739 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 9 Jul 2015 11:30:37 +0000 Subject: buggy function removed git-svn-id: http://svn.miranda-ng.org/main/trunk@14515 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/lib/mir_app.lib | Bin 64920 -> 64686 bytes bin10/lib/mir_app64.lib | Bin 62968 -> 62752 bytes bin12/lib/mir_app.lib | Bin 64920 -> 64686 bytes bin12/lib/mir_app64.lib | Bin 62968 -> 62752 bytes include/m_clist.h | 4 ---- plugins/Clist_modern/src/modern_clui.cpp | 2 +- plugins/MirLua/src/m_clist.cpp | 2 +- plugins/TabSRMM/src/controls.cpp | 2 +- src/mir_app/src/menu_clist.cpp | 14 +++++--------- src/mir_app/src/mir_app.def | 1 - src/mir_app/src/mir_app64.def | 1 - 11 files changed, 8 insertions(+), 18 deletions(-) diff --git a/bin10/lib/mir_app.lib b/bin10/lib/mir_app.lib index 19869f9fa4..e3edaad8a9 100644 Binary files a/bin10/lib/mir_app.lib and b/bin10/lib/mir_app.lib differ diff --git a/bin10/lib/mir_app64.lib b/bin10/lib/mir_app64.lib index 1bb2a3b765..11d3264414 100644 Binary files a/bin10/lib/mir_app64.lib and b/bin10/lib/mir_app64.lib differ diff --git a/bin12/lib/mir_app.lib b/bin12/lib/mir_app.lib index 19869f9fa4..e3edaad8a9 100644 Binary files a/bin12/lib/mir_app.lib and b/bin12/lib/mir_app.lib differ diff --git a/bin12/lib/mir_app64.lib b/bin12/lib/mir_app64.lib index 1bb2a3b765..11d3264414 100644 Binary files a/bin12/lib/mir_app64.lib and b/bin12/lib/mir_app64.lib differ diff --git a/include/m_clist.h b/include/m_clist.h index 24db9715a1..0e78bea758 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -69,10 +69,6 @@ EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddMainMenuItem(TMO_MenuItem *pmi); // returns a HMENU. This need not to be freed since it's owned by clist EXTERN_C MIR_APP_DLL(HMENU) Menu_GetMainMenu(void); -// rebuilds the main menu -// returns a HMENU identifying the menu. -EXTERN_C MIR_APP_DLL(HMENU) Menu_BuildMainMenu(void); - ///////////////////////////////////////////////////////////////////////////////////////// // the main menu is about to be built // wParam = lParam = 0 diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index f320d043e8..74fd4887ad 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -1808,7 +1808,7 @@ LRESULT CLUI::OnUpdate(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/) LRESULT CLUI::OnInitMenu(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/) { if (!CLUI::IsMainMenuInited()) { - Menu_BuildMainMenu(); + Menu_GetMainMenu(); CLUI::m_fMainMenuInited = TRUE; } return FALSE; diff --git a/plugins/MirLua/src/m_clist.cpp b/plugins/MirLua/src/m_clist.cpp index e386304ef2..5349c20b75 100644 --- a/plugins/MirLua/src/m_clist.cpp +++ b/plugins/MirLua/src/m_clist.cpp @@ -19,7 +19,7 @@ static int lua_AddMainMenuItem(lua_State *L) static int lua_BuildMainMenu(lua_State *L) { - HMENU res = ::Menu_BuildMainMenu(); + HMENU res = ::Menu_GetMainMenu(); lua_pushlightuserdata(L, res); return 1; diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp index 0d84f4381b..eb0daf2b79 100644 --- a/plugins/TabSRMM/src/controls.cpp +++ b/plugins/TabSRMM/src/controls.cpp @@ -393,7 +393,7 @@ void CMenuBar::invoke(const int id) m_isContactMenu = true; } else if (index == 0) { - hMenu = Menu_BuildMainMenu(); + hMenu = Menu_GetMainMenu(); m_isMainMenu = true; } else hMenu = reinterpret_cast(m_TbButtons[index].dwData); diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp index 3bd8a919d8..b193727c4f 100644 --- a/src/mir_app/src/menu_clist.cpp +++ b/src/mir_app/src/menu_clist.cpp @@ -167,8 +167,10 @@ struct MainMenuExecParam TMO_IntMenuItem *pimi; }; -MIR_APP_DLL(HMENU) Menu_BuildMainMenu(void) +MIR_APP_DLL(HMENU) Menu_GetMainMenu(void) { + RecursiveDeleteMenu(hMainMenu); + NotifyEventHooks(hPreBuildMainMenuEvent, 0, 0); Menu_Build(hMainMenu, hMainMenuObject); @@ -176,12 +178,6 @@ MIR_APP_DLL(HMENU) Menu_BuildMainMenu(void) return hMainMenu; } -MIR_APP_DLL(HMENU) Menu_GetMainMenu(void) -{ - RecursiveDeleteMenu(hMainMenu); - return Menu_BuildMainMenu(); -} - MIR_APP_DLL(HGENMENU) Menu_AddMainMenuItem(TMO_MenuItem *pmi) { MainMenuExecParam *mmep = (MainMenuExecParam*)mir_alloc(sizeof(MainMenuExecParam)); @@ -793,10 +789,10 @@ void RebuildMenuOrder(void) { BYTE bHideStatusMenu = db_get_b(NULL, "CLUI", "DontHideStatusMenu", 0); // cool perversion, though - //clear statusmenu + // clear statusmenu RecursiveDeleteMenu(hStatusMenu); - //status menu + // status menu if (hStatusMenuObject != 0) { Menu_RemoveObject(hStatusMenuObject); mir_free(hStatusMainMenuHandles); diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 56dd4712d9..b9236bd42d 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -226,7 +226,6 @@ Menu_AddMainMenuItem @223 Menu_AddProtoMenuItem @224 Menu_AddStatusMenuItem @225 Menu_BuildContactMenu @226 -Menu_BuildMainMenu @227 Menu_GetMainMenu @228 Menu_GetStatusMenu @229 Menu_BuildSubGroupMenu @230 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 0d97c9481b..263b24cdb0 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -226,7 +226,6 @@ Menu_AddMainMenuItem @223 Menu_AddProtoMenuItem @224 Menu_AddStatusMenuItem @225 Menu_BuildContactMenu @226 -Menu_BuildMainMenu @227 Menu_GetMainMenu @228 Menu_GetStatusMenu @229 Menu_BuildSubGroupMenu @230 -- cgit v1.2.3