diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-22 20:31:50 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-22 20:31:50 +0000 |
| commit | 2f615cdb8d20660d6731a782b8a90e29628cfbc4 (patch) | |
| tree | ce82df086d3221178e80dfed8ef0cc9b9c9d87f5 /plugins | |
| parent | 09a1a03baff001ef9aef7310f918e79c8c1f6e97 (diff) | |
- unused function removed;
- three wrongly removed lines of code restored
git-svn-id: http://svn.miranda-ng.org/main/trunk@6188 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Clist_modern/src/hdr/modern_commonprototypes.h | 1 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clistmod.cpp | 4 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clisttray.cpp | 8 |
3 files changed, 5 insertions, 8 deletions
diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h index 66d0e6e2b3..b1da2a00d2 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h @@ -249,7 +249,6 @@ void Docking_GetMonitorRectFromWindow(HWND hWnd,RECT *rc); void DrawAvatarImageWithGDIp(HDC hDestDC,int x, int y, DWORD width, DWORD height, HBITMAP hbmp, int x1, int y1, DWORD width1, DWORD height1,DWORD flag,BYTE alpha); //gdiplus.cpp
void FreeRowCell(); //RowHeight
void InitGdiPlus(); //gdiplus.cpp
-void InitTray(); //clisttray.c
void InvalidateDNCEbyPointer(HANDLE hContact,ClcCacheEntry *pdnce,int SettingType); //clistsettings.c
void ShutdownGdiPlus(); //gdiplus.cpp
void UninitCustomMenus(); //clistmenus.c
diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index 1dbb54c006..c8ad998e2c 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -180,6 +180,10 @@ HRESULT CluiLoadModule() CreateServiceFunction(MS_CLIST_TOGGLESOUNDS,ToggleSounds);
CreateServiceFunction(MS_CLIST_SETUSEGROUPS,SetUseGroups);
+ hCListImages = ImageList_Create(16, 16, ILC_MASK|ILC_COLOR32, 32, 0);
+ InitCustomMenus();
+ InitTrayMenus();
+
CLUI::InitClui();
return S_OK;
}
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index 35bdc19ac3..203a9b25d8 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -323,7 +323,7 @@ void DestroyTrayMenu(HMENU hMenu) int cnt = GetMenuItemCount(hMenu);
for (int i=0; i < cnt; ++i) {
HMENU hSubMenu = GetSubMenu(hMenu, i);
- if (hSubMenu == hStatusMenu || hSubMenu == hMainMenu)
+ if (hSubMenu && hSubMenu == hStatusMenu || hSubMenu == hMainMenu)
RemoveMenu(hMenu, i--, MF_BYPOSITION);
}
DestroyMenu(hMenu);
@@ -606,10 +606,4 @@ void UninitTrayMenu() hTrayMenuObject = NULL;
}
-void InitTray(void)
-{
- InitTrayMenus();
- return;
-}
-
//////////////////////////////END TRAY MENU/////////////////////////
|