diff options
| -rw-r--r-- | include/m_clist.h | 18 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp | 5 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp | 4 |
3 files changed, 11 insertions, 16 deletions
diff --git a/include/m_clist.h b/include/m_clist.h index 64105858b8..b519ec8d9b 100644 --- a/include/m_clist.h +++ b/include/m_clist.h @@ -133,12 +133,11 @@ EXTERN_C MIR_APP_DLL(HGENMENU) Menu_AddProtoMenuItem(TMO_MenuItem *mi, const cha /////////////////////////////////////////////////////////////////////////////////////////
// GROUP MENU
-typedef struct
+struct GroupMenuParam
{
int wParam;
int lParam;
-}
-GroupMenuParam, *lpGroupMenuParam;
+};
// builds the Group menu
// wParam=lParam=0
@@ -146,12 +145,11 @@ GroupMenuParam, *lpGroupMenuParam; #define MS_CLIST_MENUBUILDGROUP "CList/MenuBuildGroup"
// add a new item to the Group menus
-// wParam=lpGroupMenuParam, params to call when exec menuitem
+// wParam=GroupMenuParam*, params to call when exec menuitem
// lParam=(LPARAM)(TMO_MenuItem*)&mi
-__forceinline HGENMENU Menu_AddGroupMenuItem(lpGroupMenuParam gmp, TMO_MenuItem *mi)
+__forceinline HGENMENU Menu_AddGroupMenuItem(GroupMenuParam *gmp, TMO_MenuItem *mi)
{
- mi->hLangpack = hLangpack;
return (HGENMENU)CallService("CList/AddGroupMenuItem", (WPARAM)gmp, (LPARAM)mi);
}
@@ -168,12 +166,11 @@ __forceinline HGENMENU Menu_AddGroupMenuItem(lpGroupMenuParam gmp, TMO_MenuItem #define MS_CLIST_MENUBUILDSUBGROUP "CList/MenuBuildSubGroup"
// add a new item to the SubGroup menus
-// wParam=lpGroupMenuParam, params to call when exec menuitem
+// wParam=GroupMenuParam*, params to call when exec menuitem
// lParam=(LPARAM)(TMO_MenuItem*)&mi
-__forceinline HGENMENU Menu_AddSubGroupMenuItem(lpGroupMenuParam gmp, TMO_MenuItem *mi)
+__forceinline HGENMENU Menu_AddSubGroupMenuItem(GroupMenuParam *gmp, TMO_MenuItem *mi)
{
- mi->hLangpack = hLangpack;
return (HGENMENU)CallService("CList/AddSubGroupMenuItem", (WPARAM)gmp, (LPARAM)mi);
}
@@ -195,7 +192,6 @@ __forceinline HGENMENU Menu_AddSubGroupMenuItem(lpGroupMenuParam gmp, TMO_MenuIt __forceinline HGENMENU Menu_AddTrayMenuItem(TMO_MenuItem *mi)
{
- mi->hLangpack = hLangpack;
return (HGENMENU)CallService("CList/AddTrayMenuItem", 0, (LPARAM)mi);
}
@@ -294,7 +290,7 @@ typedef struct { LPARAM lParam; //caller defined
char *pszService; //name of the service to call on activation
union {
- char *pszTooltip; //short description of the event to display as a
+ char *pszTooltip; //short description of the event to display as a
TCHAR *ptszTooltip; //tooltip on the system tray
};
} CLISTEVENT;
diff --git a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp index 48554635ce..3bc84b1bcc 100644 --- a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp @@ -70,8 +70,7 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam, LPARAM lParam) // we need just one parametr.
mmep->szServiceName = mir_strdup(pmi->pszService);
- mmep->Param1 = 0; // mi->popupPosition; !!!!!!!!!!!!!!!!!!
- lpGroupMenuParam gmp = (lpGroupMenuParam)wParam;
+ GroupMenuParam *gmp = (GroupMenuParam*)wParam;
if (gmp != NULL) {
mmep->Param1 = gmp->wParam;
mmep->Param2 = gmp->lParam;
@@ -366,7 +365,7 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam, LPARAM lParam) TMO_MenuItem *pmi = (TMO_MenuItem*)lParam;
// we need just one parametr.
mmep->szServiceName = mir_strdup(pmi->pszService);
- lpGroupMenuParam gmp = (lpGroupMenuParam)wParam;
+ GroupMenuParam *gmp = (GroupMenuParam*)wParam;
if (gmp != NULL) {
mmep->Param1 = gmp->wParam;
mmep->Param2 = gmp->lParam;
diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp index 7f7a15e2a7..54e104243c 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp @@ -71,7 +71,7 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam, LPARAM lParam) TMO_MenuItem *pmi = (TMO_MenuItem*)lParam;
// we need just one parametr.
mmep->szServiceName = mir_strdup(pmi->pszService);
- lpGroupMenuParam gmp = (lpGroupMenuParam)wParam;
+ GroupMenuParam *gmp = (GroupMenuParam*)wParam;
if (gmp != NULL) {
mmep->Param1 = gmp->wParam;
mmep->Param2 = gmp->lParam;
@@ -350,7 +350,7 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam, LPARAM lParam) TMO_MenuItem *pmi = (TMO_MenuItem*)lParam;
// we need just one parametr.
- lpGroupMenuParam gmp = (lpGroupMenuParam)wParam;
+ GroupMenuParam *gmp = (GroupMenuParam*)wParam;
mmep->szServiceName = mir_strdup(pmi->pszService);
if (gmp != NULL) {
mmep->Param1 = gmp->wParam;
|