diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-10 17:27:44 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-10 17:27:44 +0000 |
| commit | 0558746230c69a040bb9423fbefe64ccfcfa0590 (patch) | |
| tree | dbfd57ede0d993d1cff5fc8da7832c9f592648f0 /plugins/Clist_modern/src/modern_clisttray.cpp | |
| parent | 7bd7e366fb86d1aeba7b07c30b77a9c2c67cd9f5 (diff) | |
- unused icons removed;
- spaces replaced with tabs
git-svn-id: http://svn.miranda-ng.org/main/trunk@2276 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src/modern_clisttray.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_clisttray.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index 835dcbf101..4ac629d55b 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -383,14 +383,13 @@ INT_PTR TrayIconPauseAutoHide(WPARAM wParam,LPARAM lParam) 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)
- RemoveMenu(hMenu, i--, MF_BYPOSITION);
- }
- DestroyMenu(hMenu);
+ int cnt = GetMenuItemCount(hMenu);
+ for (int i=0; i < cnt; ++i) {
+ HMENU hSubMenu = GetSubMenu(hMenu, i);
+ if (hSubMenu == hStatusMenu || hSubMenu == hMainMenu)
+ RemoveMenu(hMenu, i--, MF_BYPOSITION);
+ }
+ DestroyMenu(hMenu);
}
INT_PTR cli_TrayIconProcessMessage(WPARAM wParam,LPARAM lParam)
@@ -462,7 +461,7 @@ INT_PTR cli_TrayIconProcessMessage(WPARAM wParam,LPARAM lParam) GetCursorPos(&pt);
pcli->bTrayMenuOnScreen = TRUE;
TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN|TPM_LEFTBUTTON, pt.x, pt.y, 0, msg->hwnd, NULL);
- DestroyTrayMenu(hMenu);
+ DestroyTrayMenu(hMenu);
PostMessage(msg->hwnd, WM_NULL, 0, 0);
}
else break;
@@ -599,7 +598,7 @@ INT_PTR FreeOwnerDataTrayMenu (WPARAM wParam,LPARAM lParam) FreeAndNil((void**)&mmep);
}
- return(0);
+ return 0;
}
void InitTrayMenus(void)
@@ -716,15 +715,15 @@ void InitTrayMenus(void) DestroyIcon_protect(mi.hIcon);
}
- hMainMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN,0,0);
- hStatusMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS,0,0);
+ hMainMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN,0,0);
+ hStatusMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS,0,0);
}
void UninitTrayMenu()
{
- if (hTrayMenuObject && ServiceExists(MO_REMOVEMENUOBJECT))
- CallService(MO_REMOVEMENUOBJECT,(WPARAM)hTrayMenuObject,0);
- hTrayMenuObject = NULL;
+ if (hTrayMenuObject && ServiceExists(MO_REMOVEMENUOBJECT))
+ CallService(MO_REMOVEMENUOBJECT,(WPARAM)hTrayMenuObject,0);
+ hTrayMenuObject = NULL;
}
void InitTray(void)
|