diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-09-21 15:49:11 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-09-21 15:49:11 +0000 |
| commit | 4e0aef28194077beaaaa07775f819c3a4cf934e9 (patch) | |
| tree | 9790e7e37c3e3bac42fcdae8415cfc62e9574383 /src/modules/clist/genmenu.cpp | |
| parent | eda233a99f1a74b1d43b2cc0fd41c0a874a7b3cd (diff) | |
using Uxtheme in core
git-svn-id: http://svn.miranda-ng.org/main/trunk@6158 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/clist/genmenu.cpp')
| -rw-r--r-- | src/modules/clist/genmenu.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp index 12424d9ee0..333624777a 100644 --- a/src/modules/clist/genmenu.cpp +++ b/src/modules/clist/genmenu.cpp @@ -512,8 +512,7 @@ INT_PTR MO_CreateNewMenuObject(WPARAM, LPARAM lParam) p->Name = mir_strdup(pmp->name);
p->CheckService = mir_strdup(pmp->CheckService);
p->ExecService = mir_strdup(pmp->ExecService);
- p->m_hMenuIcons = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),
- (IsWinVerXPPlus() ? ILC_COLOR32 : ILC_COLOR16) | ILC_MASK, 15, 100);
+ p->m_hMenuIcons = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 15, 100);
g_menus.insert(p);
return p->id;
}
@@ -960,7 +959,7 @@ HMENU BuildRecursiveMenu(HMENU hMenu, PMO_IntMenuItem pRootMenu, ListParam *para mii.fMask = MIIM_DATA | MIIM_ID | MIIM_STRING;
if (pmi->iconId != -1) {
mii.fMask |= MIIM_BITMAP;
- if (IsWinVerVistaPlus() && isThemeActive()) {
+ if (IsWinVerVistaPlus() && IsThemeActive()) {
if (pmi->hBmp == NULL)
pmi->hBmp = ConvertIconToBitmap(NULL, pmi->parent->m_hMenuIcons, pmi->iconId);
mii.hbmpItem = pmi->hBmp;
|