- 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

5 files changed, 9 insertions, 9 deletions

diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp
index 5eec260dd7..4c4980ed46 100644
--- a/plugins/Weather/src/weather_contacts.cpp
+++ b/plugins/Weather/src/weather_contacts.cpp
@@ -409,10 +409,10 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 

 	case WM_DESTROY:

 		wndData = (CntSetWndDataType*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

-		Skin_ReleaseIcon(wndData->hFile);

-		Skin_ReleaseIcon(wndData->hRename);

-		Skin_ReleaseIcon(wndData->hSrchAll);

-		Skin_ReleaseIcon(wndData->hUserDetail);

+		IcoLib_ReleaseIcon(wndData->hFile);

+		IcoLib_ReleaseIcon(wndData->hRename);

+		IcoLib_ReleaseIcon(wndData->hSrchAll);

+		IcoLib_ReleaseIcon(wndData->hUserDetail);

 		mir_free(wndData);

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, 0);

 

diff --git a/plugins/Weather/src/weather_icons.cpp b/plugins/Weather/src/weather_icons.cpp
index 85884aa983..74a25ffbe8 100644
--- a/plugins/Weather/src/weather_icons.cpp
+++ b/plugins/Weather/src/weather_icons.cpp
@@ -46,7 +46,7 @@ HICON  LoadIconEx(const char* name, BOOL big)
 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", WEATHERPROTONAME, name);

-	return Skin_GetIcon(szSettingName, big);

+	return IcoLib_GetIcon(szSettingName, big);

 }

 

 HANDLE  GetIconHandle(const char* name)

@@ -60,5 +60,5 @@ HANDLE  GetIconHandle(const char* name)
 

 void  ReleaseIconEx(HICON hIcon)

 {

-	Skin_ReleaseIcon(hIcon);

+	IcoLib_ReleaseIcon(hIcon);

 }

diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp
index 485abfeefe..714df36626 100644
--- a/plugins/Weather/src/weather_mwin.cpp
+++ b/plugins/Weather/src/weather_mwin.cpp
@@ -234,7 +234,7 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 					DeleteObject(hfnt);

 				}

 				EndPaint(hwnd, &ps);

-				Skin_ReleaseIcon(hIcon);

+				IcoLib_ReleaseIcon(hIcon);

 				db_free(&dbv);

 			}

 			break;

diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp
index 17ab3696c8..3ae6f80032 100644
--- a/plugins/Weather/src/weather_popup.cpp
+++ b/plugins/Weather/src/weather_popup.cpp
@@ -141,7 +141,7 @@ LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 		return TRUE;

 

 	case UM_FREEPLUGINDATA:

-		Skin_ReleaseIcon((HICON)PUGetPluginData(hWnd));

+		IcoLib_ReleaseIcon((HICON)PUGetPluginData(hWnd));

 		return FALSE;

 	}

 

diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp
index befe325ad0..564e8e48ee 100644
--- a/plugins/Weather/src/weather_userinfo.cpp
+++ b/plugins/Weather/src/weather_userinfo.cpp
@@ -108,7 +108,7 @@ INT_PTR CALLBACK DlgProcUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 		break;

 

 	case WM_DESTROY: 

-		Skin_ReleaseIcon((HICON)SendDlgItemMessage(hwndDlg, IDC_INFOICON, STM_SETICON, 0, 0));

+		IcoLib_ReleaseIcon((HICON)SendDlgItemMessage(hwndDlg, IDC_INFOICON, STM_SETICON, 0, 0));

 		DeleteObject((HFONT)SendDlgItemMessage(hwndDlg, IDC_INFO2, WM_GETFONT, 0, 0));

 		break;