diff options
| -rw-r--r-- | include/m_clistint.h | 18 | ||||
| -rw-r--r-- | plugins/Clist_blind/src/init.cpp | 1 | ||||
| -rw-r--r-- | src/mir_app/src/clistcore.cpp | 1 | ||||
| -rw-r--r-- | src/mir_app/src/clui.cpp | 14 |
4 files changed, 19 insertions, 15 deletions
diff --git a/include/m_clistint.h b/include/m_clistint.h index 275917085c..a1c3f899ae 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -393,32 +393,32 @@ struct CLIST_INTERFACE OBJLIST<CListEvent> *events;
- CListEvent* (*pfnAddEvent)(CLISTEVENT*);
- CLISTEVENT* (*pfnGetEvent)(MCONTACT hContact, int idx);
+ CListEvent* (*pfnAddEvent)(CLISTEVENT*);
+ CLISTEVENT* (*pfnGetEvent)(MCONTACT hContact, int idx);
- int (*pfnRemoveEvent)(MCONTACT hContact, MEVENT hDbEvent);
- int (*pfnGetImlIconIndex)(HICON hIcon);
+ int (*pfnRemoveEvent)(MCONTACT hContact, MEVENT hDbEvent);
+ int (*pfnGetImlIconIndex)(HICON hIcon);
/*************************************************************************************
* version 3 additions
*************************************************************************************/
- int (*pfnGetWindowVisibleState)(HWND hWnd, int iStepX, int iStepY);
+ int (*pfnGetWindowVisibleState)(HWND hWnd, int iStepX, int iStepY);
/*************************************************************************************
- * version 4 additions (0.7.0.x) - genmenu
+ * version 4 additions - genmenu
*************************************************************************************/
OBJLIST<MenuProto> *menuProtos;
int currentDesiredStatusMode;
- BOOL bAutoRebuild;
+ bool bAutoRebuild, bOwnerDrawMenu;
/*************************************************************************************
- * version 5 additions (0.7.0.x) - tray icons
+ * version 5 additions - tray icons
*************************************************************************************/
- struct trayIconInfo_t* trayIcon;
+ trayIconInfo_t* trayIcon;
int trayIconCount;
int cycleStep;
wchar_t* szTip;
diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp index 118de95447..442d479bbd 100644 --- a/plugins/Clist_blind/src/init.cpp +++ b/plugins/Clist_blind/src/init.cpp @@ -122,6 +122,7 @@ int CMPlugin::Load() Clist_GetInterface();
coreCli = g_clistApi;
+ g_clistApi.bOwnerDrawMenu = false;
g_clistApi.hInst = g_plugin.getInst();
g_clistApi.pfnPaintClc = PaintClc;
g_clistApi.pfnContactListWndProc = ContactListWndProc;
diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp index b4a6bc2109..7443758c14 100644 --- a/src/mir_app/src/clistcore.cpp +++ b/src/mir_app/src/clistcore.cpp @@ -59,6 +59,7 @@ static int fnIsVisibleContact(ClcCacheEntry*, ClcGroup*) void InitClistCore()
{
g_clistApi.menuProtos = &g_menuProtos;
+ g_clistApi.bOwnerDrawMenu = true;
g_clistApi.pfnContactListControlWndProc = fnContactListControlWndProc;
diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp index 6166d78832..4079bdc675 100644 --- a/src/mir_app/src/clui.cpp +++ b/src/mir_app/src/clui.cpp @@ -99,12 +99,14 @@ static int CluiLangpackChanged(WPARAM, LPARAM) TranslateMenu(g_clistApi.hMenuMain);
// make menu bar owner-drawn and set it on
- MENUITEMINFO mii;
- mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_TYPE | MIIM_DATA;
- mii.dwItemData = MENU_MIRANDAMENU;
- mii.fType = MFT_OWNERDRAW;
- SetMenuItemInfo(g_clistApi.hMenuMain, 0, TRUE, &mii);
+ if (g_clistApi.bOwnerDrawMenu) {
+ MENUITEMINFO mii;
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_TYPE | MIIM_DATA;
+ mii.dwItemData = MENU_MIRANDAMENU;
+ mii.fType = MFT_OWNERDRAW;
+ SetMenuItemInfo(g_clistApi.hMenuMain, 0, TRUE, &mii);
+ }
if (GetMenu(g_clistApi.hwndContactList))
SetMenu(g_clistApi.hwndContactList, g_clistApi.hMenuMain);
|