summaryrefslogtreecommitdiff
path: root/plugins/TopToolBar
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-06-15 14:23:02 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-06-15 14:23:02 +0000
commit3f9882178018afbe9aaaba1f4461f3fc75493260 (patch)
tree50554bd4a21472624c94a859bfdc5e8758becd45 /plugins/TopToolBar
parent547ec570deb26f93fa4ab974a76c0e964a635586 (diff)
MS_SKIN_LOADICON & MS_SKIN_LOADPROTOICON replaced with direct function calls
git-svn-id: http://svn.miranda-ng.org/main/trunk@14176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TopToolBar')
-rw-r--r--plugins/TopToolBar/src/InternalButtons.cpp4
-rw-r--r--plugins/TopToolBar/src/toolbarwnd.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/TopToolBar/src/InternalButtons.cpp b/plugins/TopToolBar/src/InternalButtons.cpp
index 943950fe3d..b7f5c8995f 100644
--- a/plugins/TopToolBar/src/InternalButtons.cpp
+++ b/plugins/TopToolBar/src/InternalButtons.cpp
@@ -135,10 +135,10 @@ void InitInternalButtons()
ttb.hIconDn = NULL;
}
else {
- ttb.hIconHandleUp = LoadSkinnedIconHandle(stdButtons[i].iconidUp);
+ ttb.hIconHandleUp = Skin_GetIconHandle(stdButtons[i].iconidUp);
if (stdButtons[i].iconidDn) {
ttb.dwFlags |= TTBBF_ASPUSHBUTTON;
- ttb.hIconHandleDn = LoadSkinnedIconHandle(stdButtons[i].iconidDn);
+ ttb.hIconHandleDn = Skin_GetIconHandle(stdButtons[i].iconidDn);
}
else
ttb.hIconHandleDn = ttb.hIconDn = NULL;
diff --git a/plugins/TopToolBar/src/toolbarwnd.cpp b/plugins/TopToolBar/src/toolbarwnd.cpp
index 08ce75a4bf..9f85e57dac 100644
--- a/plugins/TopToolBar/src/toolbarwnd.cpp
+++ b/plugins/TopToolBar/src/toolbarwnd.cpp
@@ -279,7 +279,7 @@ INT_PTR OnEventFire(WPARAM wParam, LPARAM lParam)
Frame.align = alTop;
Frame.Flags = F_VISIBLE | F_NOBORDER | F_LOCKED | F_TCHAR;
Frame.height = g_ctrl->nLastHeight;
- Frame.hIcon = LoadSkinnedIcon(SKINICON_OTHER_FRAME);
+ Frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME);
g_ctrl->hFrame = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0);
}