- 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

4 files changed, 6 insertions, 6 deletions

diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp
index 84b1fc6fb4..fc04aca7c2 100644
--- a/src/core/stdchat/src/options.cpp
+++ b/src/core/stdchat/src/options.cpp
@@ -310,7 +310,7 @@ HICON LoadIconEx(char* pszIcoLibName, BOOL big)
 {

 	char szTemp[256];

 	mir_snprintf(szTemp, "chat_%s", pszIcoLibName);

-	return Skin_GetIcon(szTemp, big);

+	return IcoLib_GetIcon(szTemp, big);

 }

 

 static void InitSetting(TCHAR** ppPointer, char* pszSetting, TCHAR* pszDefault)

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 1f86aba0ec..fe5f689eb2 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1314,7 +1314,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					if ((g_dat.flags & SMF_SHOWTYPINGWIN) && GetForegroundWindow() != hwndDlg) {

 						HICON hIcon = (HICON)SendMessage(hwndDlg, WM_GETICON, ICON_SMALL, 0);

 						SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hTyping);

-						Skin_ReleaseIcon(hIcon);

+						IcoLib_ReleaseIcon(hIcon);

 					}

 					dat->showTyping = 1;

 				}

@@ -1352,7 +1352,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 						}

 						else DrawIconEx(dis->hDC, dis->rcItem.left, dis->rcItem.top, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, NULL, DI_NORMAL);

 

-						Skin_ReleaseIcon(hIcon);

+						IcoLib_ReleaseIcon(hIcon);

 						return TRUE;

 					}

 				}

diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 4852cf91d1..22fd62bf67 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -530,14 +530,14 @@ void LoadMsgLogIcons(void)
 	PBYTE pBmpBits = (PBYTE)mir_alloc(widthBytes * bih.biHeight);

 

 	for (int i = 0; i < SIZEOF(pLogIconBmpBits); i++) {

-		HICON hIcon = Skin_GetIconByHandle(iconList[i].hIcolib);

+		HICON hIcon = IcoLib_GetIconByHandle(iconList[i].hIcolib);

 		size_t size = RTFPICTHEADERMAXSIZE + (bih.biSize + widthBytes * bih.biHeight) * 2;

 		pLogIconBmpBits[i] = (char*)mir_alloc(size);

 		size_t rtfHeaderSize = mir_snprintf(pLogIconBmpBits[i], size, "{\\pict\\dibitmap0\\wbmbitspixel%u\\wbmplanes1\\wbmwidthbytes%u\\picw%u\\pich%u ", bih.biBitCount, widthBytes, bih.biWidth, bih.biHeight);

 		HBITMAP hoBmp = (HBITMAP)SelectObject(hdcMem, hBmp);

 		FillRect(hdcMem, &rc, hBkgBrush);

 		DrawIconEx(hdcMem, 0, 0, hIcon, bih.biWidth, bih.biHeight, 0, NULL, DI_NORMAL);

-		Skin_ReleaseIcon(hIcon);

+		IcoLib_ReleaseIcon(hIcon);

 

 		SelectObject(hdcMem, hoBmp);

 		GetDIBits(hdc, hBmp, 0, bih.biHeight, pBmpBits, (BITMAPINFO*)&bih, DIB_RGB_COLORS);

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 80c55f5a4f..b152ed7bb7 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -186,7 +186,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 			cle.ptszTooltip = szTip;

 			CallServiceSync(MS_CLIST_REMOVEEVENT, hContact, 1);

 			CallServiceSync(MS_CLIST_ADDEVENT, hContact, (LPARAM)&cle);

-			Skin_ReleaseIcon(cle.hIcon);

+			IcoLib_ReleaseIcon(cle.hIcon);

 		}

 	}

 	return 0;