diff options
| -rw-r--r-- | include/m_clist.h | 5 | ||||
| -rw-r--r-- | src/mir_app/src/genmenu.h | 2 | ||||
| -rw-r--r-- | src/mir_app/src/menu_groups.cpp | 9 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 |
5 files changed, 3 insertions, 15 deletions
diff --git a/include/m_clist.h b/include/m_clist.h index d5ea0fd95d..d56c18766b 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -165,11 +165,6 @@ EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddGroupMenuItem(TMO_MenuItem *pmi, GroupMen /////////////////////////////////////////////////////////////////////////////////////////
// SUBGROUP MENU
-// builds the SubGroup menu
-// returns a HMENU identifying the menu.
-
-EXTERN_C MIR_APP_DLL(HMENU) Menu_BuildSubGroupMenu(struct ClcGroup *group);
-
// adds a new item to the SubGroup menus
// wParam=GroupMenuParam*, params to call when exec menuitem
// lParam=(LPARAM)(TMO_MenuItem*)&mi
diff --git a/src/mir_app/src/genmenu.h b/src/mir_app/src/genmenu.h index faa94a64c4..c935e5d00b 100644 --- a/src/mir_app/src/genmenu.h +++ b/src/mir_app/src/genmenu.h @@ -126,6 +126,8 @@ int UninitGenMenu(); int Menu_LoadFromDatabase(TMO_IntMenuItem *pimi, void *param);
+HMENU Menu_BuildSubGroupMenu(struct ClcGroup *group);
+
LPTSTR GetMenuItemText(TMO_IntMenuItem*);
int GenMenuOptInit(WPARAM wParam, LPARAM);
diff --git a/src/mir_app/src/menu_groups.cpp b/src/mir_app/src/menu_groups.cpp index e0a6499c10..b2a6900471 100644 --- a/src/mir_app/src/menu_groups.cpp +++ b/src/mir_app/src/menu_groups.cpp @@ -157,7 +157,7 @@ struct SubGroupMenuExecParam int Param1, Param2;
};
-MIR_APP_DLL(HMENU) Menu_BuildSubGroupMenu(ClcGroup *group)
+HMENU Menu_BuildSubGroupMenu(ClcGroup *group)
{
NotifyEventHooks(hEventPreBuildSubGroupMenu, (WPARAM)group, 0);
@@ -168,13 +168,6 @@ MIR_APP_DLL(HMENU) Menu_BuildSubGroupMenu(ClcGroup *group) /////////////////////////////////////////////////////////////////////////////////////////
-HMENU cliBuildGroupPopupMenu(ClcGroup *group)
-{
- return Menu_BuildSubGroupMenu(group);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
MIR_APP_DLL(HGENMENU) Menu_AddSubGroupMenuItem(TMO_MenuItem *pmi, GroupMenuParam *gmp)
{
SubGroupMenuExecParam *mmep = (SubGroupMenuExecParam *)mir_calloc(sizeof(SubGroupMenuExecParam));
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index dee58045b1..960ee9e602 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -157,7 +157,6 @@ Menu_AddStatusMenuItem @225 Menu_BuildContactMenu @226
Menu_GetMainMenu @228
Menu_GetStatusMenu @229
-Menu_BuildSubGroupMenu @230
Menu_AddGroupMenuItem @231
Menu_AddSubGroupMenuItem @232
Menu_BuildGroupMenu @233
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index d5b82b164f..071500ff5d 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -157,7 +157,6 @@ Menu_AddStatusMenuItem @225 Menu_BuildContactMenu @226
Menu_GetMainMenu @228
Menu_GetStatusMenu @229
-Menu_BuildSubGroupMenu @230
Menu_AddGroupMenuItem @231
Menu_AddSubGroupMenuItem @232
Menu_BuildGroupMenu @233
|