From 8607a3a930f014ffabe03535e4ba5f2429fa395f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 16 Jan 2024 17:30:22 +0300 Subject: no need to export Menu_BuildGroupMenu from mir_app --- include/m_clist.h | 9 --------- src/mir_app/src/clui.cpp | 3 ++- src/mir_app/src/genmenu.h | 3 ++- src/mir_app/src/menu_groups.cpp | 2 +- src/mir_app/src/mir_app.def | 1 - src/mir_app/src/mir_app64.def | 1 - 6 files changed, 5 insertions(+), 14 deletions(-) diff --git a/include/m_clist.h b/include/m_clist.h index d56c18766b..4c58f89896 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -148,18 +148,11 @@ struct GroupMenuParam int lParam; }; -// builds the Group menu -// returns a HMENU identifying the menu. - -EXTERN_C MIR_APP_DLL(HMENU) Menu_BuildGroupMenu(void); - // adds a new item to the Group menus - EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddGroupMenuItem(TMO_MenuItem *pmi, GroupMenuParam *gmp = nullptr); // the Group menu is about to be built // wParam = lParam = 0 - #define ME_CLIST_PREBUILDGROUPMENU "CList/PreBuildGroupMenu" ///////////////////////////////////////////////////////////////////////////////////////// @@ -168,12 +161,10 @@ EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddGroupMenuItem(TMO_MenuItem *pmi, GroupMen // adds a new item to the SubGroup menus // wParam=GroupMenuParam*, params to call when exec menuitem // lParam=(LPARAM)(TMO_MenuItem*)&mi - EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddSubGroupMenuItem(TMO_MenuItem *pmi, GroupMenuParam *gmp = nullptr); // the SubGroup menu is about to be built // wParam = lParam = 0 - #define ME_CLIST_PREBUILDSUBGROUPMENU "CList/PreBuildSubGroupMenu" ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp index 4925c04e42..3837862075 100644 --- a/src/mir_app/src/clui.cpp +++ b/src/mir_app/src/clui.cpp @@ -23,8 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "stdafx.h" -#include "profilemanager.h" #include "clc.h" +#include "profilemanager.h" +#include "genmenu.h" #define TM_AUTOALPHA 1 #define MENU_MIRANDAMENU 0xFFFF1234 diff --git a/src/mir_app/src/genmenu.h b/src/mir_app/src/genmenu.h index c935e5d00b..072c252171 100644 --- a/src/mir_app/src/genmenu.h +++ b/src/mir_app/src/genmenu.h @@ -120,12 +120,13 @@ __forceinline TMO_IntMenuItem* MO_RecursiveWalkMenu(TMO_IntMenuItem *pimi, pfnWa return MO_RecursiveWalkMenu(pimi, pFunc, (void *)pszParam); } -//general stuff +// general stuff int InitGenMenu(); int UninitGenMenu(); int Menu_LoadFromDatabase(TMO_IntMenuItem *pimi, void *param); +HMENU Menu_BuildGroupMenu(void); HMENU Menu_BuildSubGroupMenu(struct ClcGroup *group); LPTSTR GetMenuItemText(TMO_IntMenuItem*); diff --git a/src/mir_app/src/menu_groups.cpp b/src/mir_app/src/menu_groups.cpp index b2a6900471..ea5b08bc98 100644 --- a/src/mir_app/src/menu_groups.cpp +++ b/src/mir_app/src/menu_groups.cpp @@ -43,7 +43,7 @@ struct GroupMenuExecParam int Param1, Param2; }; -MIR_APP_DLL(HMENU) Menu_BuildGroupMenu() +HMENU Menu_BuildGroupMenu() { NotifyEventHooks(hEventPreBuildGroupMenu, 0, 0); diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 968255051f..f1267d12ad 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -159,7 +159,6 @@ Menu_GetMainMenu @228 Menu_GetStatusMenu @229 Menu_AddGroupMenuItem @231 Menu_AddSubGroupMenuItem @232 -Menu_BuildGroupMenu @233 Menu_AddTrayMenuItem @234 Menu_BuildTrayMenu @235 Menu_DestroyNestedMenu @236 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index a4f606ee4d..4dd4d1e245 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -159,7 +159,6 @@ Menu_GetMainMenu @228 Menu_GetStatusMenu @229 Menu_AddGroupMenuItem @231 Menu_AddSubGroupMenuItem @232 -Menu_BuildGroupMenu @233 Menu_AddTrayMenuItem @234 Menu_BuildTrayMenu @235 Menu_DestroyNestedMenu @236 -- cgit v1.2.3