From 02ed4455c23e3562d71bfc80a0e2c4fede8708f1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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
---
 plugins/WhenWasIt/src/dlg_handlers.cpp | 12 ++++++------
 plugins/WhenWasIt/src/icons.cpp        |  2 +-
 plugins/WhenWasIt/src/icons.h          |  2 +-
 plugins/WhenWasIt/src/services.cpp     |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/WhenWasIt/src')

diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp
index 2200ffddcd..65ba3dcd34 100644
--- a/plugins/WhenWasIt/src/dlg_handlers.cpp
+++ b/plugins/WhenWasIt/src/dlg_handlers.cpp
@@ -403,7 +403,7 @@ INT_PTR CALLBACK DlgProcAddBirthday(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l
 			WindowList_Add(hAddBirthdayWndsList, hWnd, hContact);
 			Utils_RestoreWindowPositionNoSize(hWnd, hContact, ModuleName, "BirthdayWnd");
 		}
-		SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(hAddBirthdayContact, 1));
+		SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(hAddBirthdayContact, 1));
 		{
 			for (int i = 0; i < cSaveModule; i++)
 				SendDlgItemMessage(hWnd, IDC_COMPATIBILITY, CB_ADDSTRING, 0, (LPARAM)TranslateTS(szSaveModule[i]));
@@ -475,7 +475,7 @@ INT_PTR CALLBACK DlgProcAddBirthday(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l
 
 	case WM_DESTROY:
 		RefreshContactListIcons(hContact); //the birthday might be changed, refresh icon.
-		Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_GETICON, ICON_BIG, 0));
+		IcoLib_ReleaseIcon((HICON)SendMessage(hWnd, WM_GETICON, ICON_BIG, 0));
 		Utils_SaveWindowPosition(hWnd, hContact, ModuleName, "BirthdayWnd");
 		WindowList_Remove(hAddBirthdayWndsList, hWnd);
 		break;
@@ -716,7 +716,7 @@ INT_PTR CALLBACK DlgProcBirthdays(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 	switch (msg) {
 	case WM_INITDIALOG:
 		TranslateDialogDefault(hWnd);
-		SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(hListMenu));
+		SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(hListMenu));
 		{
 			HWND hList = GetDlgItem(hWnd, IDC_BIRTHDAYS_LIST);
 
@@ -832,7 +832,7 @@ INT_PTR CALLBACK DlgProcBirthdays(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 	case WM_DESTROY:
 		hBirthdaysDlg = NULL;
 		Utils_SaveWindowPosition(hWnd, NULL, ModuleName, "BirthdayList");
-		Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_GETICON, ICON_BIG, 0));
+		IcoLib_ReleaseIcon((HICON)SendMessage(hWnd, WM_GETICON, ICON_BIG, 0));
 		lastColumn = -1;
 		break;
 
@@ -850,7 +850,7 @@ INT_PTR CALLBACK DlgProcUpcoming(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
 	{
 		TranslateDialogDefault(hWnd);
 		timeout = commonData.cDlgTimeout;
-		SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIconByHandle(hListMenu));
+		SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIconByHandle(hListMenu));
 		HWND hList = GetDlgItem(hWnd, IDC_UPCOMING_LIST);
 
 		mir_subclassWindow(hList, BirthdaysListSubclassProc);
@@ -960,7 +960,7 @@ INT_PTR CALLBACK DlgProcUpcoming(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar
 	case WM_DESTROY:
 		hUpcomingDlg = NULL;
 		Utils_SaveWindowPosition(hWnd, NULL, ModuleName, "BirthdayListUpcoming");
-		Skin_ReleaseIcon((HICON)SendMessage(hWnd, WM_GETICON, ICON_BIG, 0));
+		IcoLib_ReleaseIcon((HICON)SendMessage(hWnd, WM_GETICON, ICON_BIG, 0));
 		KillTimer(hWnd, UPCOMING_TIMER_ID);
 		break;
 	}
diff --git a/plugins/WhenWasIt/src/icons.cpp b/plugins/WhenWasIt/src/icons.cpp
index fbaed89acf..6dd5157fb3 100644
--- a/plugins/WhenWasIt/src/icons.cpp
+++ b/plugins/WhenWasIt/src/icons.cpp
@@ -39,7 +39,7 @@ static HANDLE AddIcon(char *name, char *description, TCHAR *tszPath, int iDefaul
 	sid.pszName = name;
 	sid.defaultFile.t = tszPath;
 	sid.iDefaultIndex = -iDefaultIdx;
-	return Skin_AddIcon(&sid);
+	return IcoLib_AddIcon(&sid);
 }
 
 int AddIcons()
diff --git a/plugins/WhenWasIt/src/icons.h b/plugins/WhenWasIt/src/icons.h
index df3766b2ad..bf440d01e7 100644
--- a/plugins/WhenWasIt/src/icons.h
+++ b/plugins/WhenWasIt/src/icons.h
@@ -40,7 +40,7 @@ HANDLE GetDTBIconHandle(int dtb);
 
 __forceinline HICON GetDTBIcon(int dtb)
 {
-	return Skin_GetIconByHandle(GetDTBIconHandle(dtb));
+	return IcoLib_GetIconByHandle(GetDTBIconHandle(dtb));
 }
 
 #endif //M_WWI_ICONS_H
\ No newline at end of file
diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp
index 79c699d7de..3e392520c9 100644
--- a/plugins/WhenWasIt/src/services.cpp
+++ b/plugins/WhenWasIt/src/services.cpp
@@ -179,7 +179,7 @@ INT_PTR AddBirthdayService(WPARAM hContact, LPARAM lParam)
 void ShowPopupMessage(TCHAR *title, TCHAR *message, HANDLE icon)
 {
 	POPUPDATAT pd = { 0 };
-	pd.lchIcon = Skin_GetIconByHandle(icon);
+	pd.lchIcon = IcoLib_GetIconByHandle(icon);
 	_tcsncpy(pd.lptzContactName, title, MAX_CONTACTNAME - 1);
 	_tcsncpy(pd.lptzText, message, MAX_SECONDLINE - 1);
 	pd.colorText = commonData.foreground;
-- 
cgit v1.2.3