From 02ed4455c23e3562d71bfc80a0e2c4fede8708f1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 14 Jun 2015 13:17:26 +0000 Subject: - 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 --- protocols/Gadu-Gadu/src/gg.h | 4 ++-- protocols/Gadu-Gadu/src/icolib.cpp | 12 ++++++------ protocols/Gadu-Gadu/src/links.cpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'protocols/Gadu-Gadu/src') diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h index c93923b8a4..a2b2525ef3 100644 --- a/protocols/Gadu-Gadu/src/gg.h +++ b/protocols/Gadu-Gadu/src/gg.h @@ -322,9 +322,9 @@ char *gg_avatarhash(char *param); /* IcoLib functions */ void gg_icolib_init(); -HICON LoadIconEx(const char* name, BOOL big); +HICON LoadIconEx(const char* name, bool big); HANDLE GetIconHandle(int iconId); -void ReleaseIconEx(const char* name, BOOL big); +void ReleaseIconEx(const char* name, bool big); void WindowSetIcon(HWND hWnd, const char* name); void WindowFreeIcon(HWND hWnd); diff --git a/protocols/Gadu-Gadu/src/icolib.cpp b/protocols/Gadu-Gadu/src/icolib.cpp index b50d305a5d..a0b9c291de 100644 --- a/protocols/Gadu-Gadu/src/icolib.cpp +++ b/protocols/Gadu-Gadu/src/icolib.cpp @@ -48,11 +48,11 @@ void gg_icolib_init() Icon_Register(hInstance, "Protocols/" GGDEF_PROTO, iconList, SIZEOF(iconList), GGDEF_PROTO); } -HICON LoadIconEx(const char* name, BOOL big) +HICON LoadIconEx(const char* name, bool big) { char szSettingName[100]; mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", GGDEF_PROTO, name); - return Skin_GetIcon(szSettingName, big); + return IcoLib_GetIcon(szSettingName, big); } HANDLE GetIconHandle(int iconId) @@ -63,11 +63,11 @@ HANDLE GetIconHandle(int iconId) return NULL; } -void ReleaseIconEx(const char* name, BOOL big) +void ReleaseIconEx(const char* name, bool big) { char szSettingName[100]; mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", GGDEF_PROTO, name); - Skin_ReleaseIcon(szSettingName, big); + IcoLib_Release(szSettingName, big); } void WindowSetIcon(HWND hWnd, const char* name) @@ -78,6 +78,6 @@ void WindowSetIcon(HWND hWnd, const char* name) void WindowFreeIcon(HWND hWnd) { - Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_BIG, 0)); - Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_SMALL, 0)); + IcoLib_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_BIG, 0)); + IcoLib_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_SMALL, 0)); } diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp index 637001281d..c9407b2473 100644 --- a/protocols/Gadu-Gadu/src/links.cpp +++ b/protocols/Gadu-Gadu/src/links.cpp @@ -74,7 +74,7 @@ static INT_PTR gg_parselink(WPARAM wParam, LPARAM lParam) Menu_ModifyItem(gg->hInstanceMenuItem, &mi); if (mi.hIcon) - Skin_ReleaseIcon(mi.hIcon); + IcoLib_ReleaseIcon(mi.hIcon); } if (items > 1) { -- cgit v1.2.3