diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-01-23 15:26:17 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-01-23 15:26:17 +0000 |
| commit | 5be50e1630a2f6a97c6becaf678e000fcd23656a (patch) | |
| tree | 86cfd8f8f3f9dee1e2b7868901030473ad74457c /plugins/Clist_modern/src/modern_toolbar.cpp | |
| parent | 286818877f50dc103288ae15495c08e6663b1818 (diff) | |
- main menu icon excluded from toolbar_icons.dll, it's grabbed via SKIN_OTHER_MAINMENU instead;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@3249 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src/modern_toolbar.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_toolbar.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 26683dceee..5e3c00e496 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -68,14 +68,17 @@ static int Modern_InitButtons(WPARAM, LPARAM) tbb.pszTooltipDn = LPGEN(BTNS[i].pszTooltipDn);
char buf[255];
- mir_snprintf(buf,SIZEOF(buf),"%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_dn");
- tbb.hIconHandleUp = RegisterIcolibIconHandle( buf, "Toolbar", BTNS[i].pszTooltipUp, _T("icons\\toolbar_icons.dll"),-BTNS[i].icoDefIdx, g_hInst, BTNS[i].defResource );
+ if (i != 0) {
+ mir_snprintf(buf,SIZEOF(buf),"%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_dn");
+ tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, _T("icons\\toolbar_icons.dll"),-BTNS[i].icoDefIdx, g_hInst, BTNS[i].defResource);
+ }
+ else tbb.hIconHandleUp = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipUp, NULL, 0, NULL, SKINICON_OTHER_MAINMENU);
if (BTNS[i].pszTooltipDn) {
tbb.dwFlags |= TTBBF_ASPUSHBUTTON;
mir_snprintf(buf,SIZEOF(buf),"%s%s%s", TTB_OPTDIR, BTNS[i].pszButtonID, "_up");
- tbb.hIconHandleDn = RegisterIcolibIconHandle( buf, "Toolbar", BTNS[i].pszTooltipDn, _T("icons\\toolbar_icons.dll"),-(BTNS[i].icoDefIdx+1), g_hInst, BTNS[i].defResource2 );
+ tbb.hIconHandleDn = RegisterIcolibIconHandle(buf, "Toolbar", BTNS[i].pszTooltipDn, _T("icons\\toolbar_icons.dll"),-(BTNS[i].icoDefIdx+1), g_hInst, BTNS[i].defResource2 );
}
else tbb.hIconHandleDn = NULL;
}
|