diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-14 13:17:26 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-14 13:17:26 +0000 |
| commit | 02ed4455c23e3562d71bfc80a0e2c4fede8708f1 (patch) | |
| tree | 115a3d24e4a3877cd28bd4ff2d9d4011b790cc5f /plugins/TopToolBar | |
| parent | c72584d6b934b37dbd18d5f15ffb24a140e1e3f2 (diff) | |
- all icolib services removed;
- IcoLib_* functions are bound directly to the code
git-svn-id: http://svn.miranda-ng.org/main/trunk@14161 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TopToolBar')
| -rw-r--r-- | plugins/TopToolBar/src/toolbar.cpp | 14 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/ttbopt.cpp | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/plugins/TopToolBar/src/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp index 0842ce95e3..d93abb0494 100644 --- a/plugins/TopToolBar/src/toolbar.cpp +++ b/plugins/TopToolBar/src/toolbar.cpp @@ -148,7 +148,7 @@ static void Icon2button(TTBButton *but, HANDLE &hIcoLib, HICON &hIcon, bool bIsU return;
}
- hIcoLib = (HANDLE)CallService(MS_SKIN2_ISMANAGEDICON, WPARAM(hSrc), 0);
+ hIcoLib = IcoLib_IsManaged((HICON)hSrc);
if (!hIcoLib) {
char buf[256];
mir_snprintf(buf, "toptoolbar_%s%s", but->name, bIsUp ? (but->hIconDn ? "%s_up" : "%s") : "%s_dn");
@@ -160,10 +160,10 @@ static void Icon2button(TTBButton *but, HANDLE &hIcoLib, HICON &hIcon, bool bIsU mir_snprintf(buf, "%s%s", but->name, bIsUp ? "" : " (pressed)");
sid.description.a = buf;
sid.hDefaultIcon = bIsUp ? but->hIconUp : but->hIconDn;
- hIcoLib = Skin_AddIcon(&sid);
+ hIcoLib = IcoLib_AddIcon(&sid);
}
- hIcon = Skin_GetIconByHandle(hIcoLib);
+ hIcon = IcoLib_GetIconByHandle(hIcoLib);
}
TopButtonInt *CreateButton(TTBButton *but)
@@ -516,12 +516,12 @@ int OnIconChange(WPARAM, LPARAM) continue;
if (b->hIconHandleUp) {
- Skin_ReleaseIcon(b->hIconUp);
- b->hIconUp = Skin_GetIconByHandle(b->hIconHandleUp);
+ IcoLib_ReleaseIcon(b->hIconUp);
+ b->hIconUp = IcoLib_GetIconByHandle(b->hIconHandleUp);
}
if (b->hIconHandleDn) {
- Skin_ReleaseIcon(b->hIconDn);
- b->hIconDn = Skin_GetIconByHandle(b->hIconHandleDn);
+ IcoLib_ReleaseIcon(b->hIconDn);
+ b->hIconDn = IcoLib_GetIconByHandle(b->hIconHandleDn);
}
DestroyWindow(b->hwnd);
b->CreateWnd();
diff --git a/plugins/TopToolBar/src/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp index 2a4290323d..6f890d59aa 100644 --- a/plugins/TopToolBar/src/ttbopt.cpp +++ b/plugins/TopToolBar/src/ttbopt.cpp @@ -26,9 +26,9 @@ static HTREEITEM AddLine(HWND hTree,TopButtonInt *b, HTREEITEM hItem, HIMAGELIST }
else {
if (b->hIconHandleUp) {
- HICON hIcon = Skin_GetIconByHandle(b->hIconHandleUp);
+ HICON hIcon = IcoLib_GetIconByHandle(b->hIconHandleUp);
index = ImageList_AddIcon(il, hIcon);
- Skin_ReleaseIcon(hIcon);
+ IcoLib_ReleaseIcon(hIcon);
}
else index = ImageList_AddIcon(il, b->hIconUp);
|