summaryrefslogtreecommitdiff
path: root/src/mir_app
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-07-16 20:05:28 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-07-16 20:05:28 +0300
commit38cc6ba3c3f5cb41d491df8414b270158152f3da (patch)
treef9957cb59b375de20b447deabe873a96ceaf634a /src/mir_app
parent1d002790ba625d5af4e1932ad95710203e5b6e9c (diff)
fixes #1503 (Clist_blind: Main menu has gone)
Diffstat (limited to 'src/mir_app')
-rw-r--r--src/mir_app/src/clistcore.cpp1
-rw-r--r--src/mir_app/src/clui.cpp14
2 files changed, 9 insertions, 6 deletions
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);