- 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, 15 insertions, 15 deletions

diff --git a/plugins/SpellChecker/src/ardialog.cpp b/plugins/SpellChecker/src/ardialog.cpp
index a3a5e3d24d..72fc6548c0 100644
--- a/plugins/SpellChecker/src/ardialog.cpp
+++ b/plugins/SpellChecker/src/ardialog.cpp
@@ -165,9 +165,9 @@ static INT_PTR CALLBACK AddReplacementDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 			SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_OLD), GWLP_USERDATA, (LONG_PTR)data);

 			mir_subclassWindow(GetDlgItem(hwndDlg, IDC_OLD), OnlyCharsEditProc);

 

-			HICON hIcon = Skin_GetIcon("spellchecker_enabled");

+			HICON hIcon = IcoLib_GetIcon("spellchecker_enabled");

 			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon);

-			Skin_ReleaseIcon(hIcon);

+			IcoLib_ReleaseIcon(hIcon);

 

 			SendDlgItemMessage(hwndDlg, IDC_OLD, EM_LIMITTEXT, 256, 0);

 			SendDlgItemMessage(hwndDlg, IDC_NEW, EM_LIMITTEXT, 256, 0);

diff --git a/plugins/SpellChecker/src/options.cpp b/plugins/SpellChecker/src/options.cpp
index a1f855ef59..e36ac30ce2 100644
--- a/plugins/SpellChecker/src/options.cpp
+++ b/plugins/SpellChecker/src/options.cpp
@@ -137,14 +137,14 @@ static void DrawItem(LPDRAWITEMSTRUCT lpdis, Dictionary *dict)
 

 	// Draw icon

 	if (opts.use_flags) {

-		HICON hFlag = Skin_GetIconByHandle(dict->hIcolib);

+		HICON hFlag = IcoLib_GetIconByHandle(dict->hIcolib);

 

 		rc.top = (lpdis->rcItem.bottom + lpdis->rcItem.top - ICON_SIZE) / 2;

 		DrawIconEx(lpdis->hDC, rc.left, rc.top, hFlag, 16, 16, 0, NULL, DI_NORMAL);

 

 		rc.left += ICON_SIZE + 4;

 

-		Skin_ReleaseIcon(hFlag);

+		IcoLib_ReleaseIcon(hFlag);

 	}

 

 	// Draw text

diff --git a/plugins/SpellChecker/src/spellchecker.cpp b/plugins/SpellChecker/src/spellchecker.cpp
index 6e539a8b19..6f02a86c14 100644
--- a/plugins/SpellChecker/src/spellchecker.cpp
+++ b/plugins/SpellChecker/src/spellchecker.cpp
@@ -73,7 +73,7 @@ static int IconsChanged(WPARAM, LPARAM)
 {
 	StatusIconData sid = { sizeof(sid) };
 	sid.szModule = MODULE_NAME;
-	sid.hIconDisabled = Skin_GetIcon("spellchecker_disabled");
+	sid.hIconDisabled = IcoLib_GetIcon("spellchecker_disabled");
 	sid.flags = MBF_HIDDEN | MBF_TCHAR;
 
 	for (int i = 0; i < languages.getCount(); i++) {
@@ -84,9 +84,9 @@ static int IconsChanged(WPARAM, LPARAM)
 			TranslateT("Spell Checker"), languages[i]->full_name);
 		sid.tszTooltip = tmp;
 
-		HICON hIcon = (opts.use_flags) ? Skin_GetIconByHandle(languages[i]->hIcolib) : Skin_GetIcon("spellchecker_enabled");
+		HICON hIcon = (opts.use_flags) ? IcoLib_GetIconByHandle(languages[i]->hIcolib) : IcoLib_GetIcon("spellchecker_enabled");
 		sid.hIcon = CopyIcon(hIcon);
-		Skin_ReleaseIcon(hIcon);
+		IcoLib_ReleaseIcon(hIcon);
 
 		Srmm_ModifyIcon(NULL, &sid);
 	}
@@ -141,7 +141,7 @@ static int ModulesLoaded(WPARAM, LPARAM)
 		TCHAR path[MAX_PATH];
 		GetModuleFileName(hInst, path, MAX_PATH);
 
-		SKINICONDESC sid = { 0 };

+		SKINICONDESC sid = { 0 };
 		sid.flags = SIDF_ALL_TCHAR | SIDF_SORTED;
 		sid.section.t = LPGENT("Spell Checker")_T("/")LPGENT("Flags");
 
@@ -164,19 +164,19 @@ static int ModulesLoaded(WPARAM, LPARAM)
 				sid.iDefaultIndex = 0;
 			}
 			else {
-				hFlagIcoLib = Skin_GetIcon("spellchecker_unknown");
+				hFlagIcoLib = IcoLib_GetIcon("spellchecker_unknown");
 				sid.hDefaultIcon = hFlagIcoLib;
 				sid.defaultFile.t = NULL;
 				sid.iDefaultIndex = 0;
 			}
 
 			// Oki, lets add to IcoLib, then
-			p->hIcolib = Skin_AddIcon(&sid);
+			p->hIcolib = IcoLib_AddIcon(&sid);
 
 			if (hFlag != NULL)
 				DestroyIcon(hFlag);
 			else
-				Skin_ReleaseIcon(hFlagIcoLib);
+				IcoLib_ReleaseIcon(hFlagIcoLib);
 		}
 		FreeLibrary(hFlagsDll);
 	}
@@ -199,7 +199,7 @@ static int ModulesLoaded(WPARAM, LPARAM)
 
 	StatusIconData sid = { sizeof(sid) };
 	sid.szModule = MODULE_NAME;
-	sid.hIconDisabled = Skin_GetIcon("spellchecker_disabled");
+	sid.hIconDisabled = IcoLib_GetIcon("spellchecker_disabled");
 	sid.flags = MBF_TCHAR | MBF_HIDDEN;
 
 	for (int i = 0; i < languages.getCount(); i++) {
@@ -209,7 +209,7 @@ static int ModulesLoaded(WPARAM, LPARAM)
 		mir_sntprintf(tmp, SIZEOF(tmp), _T("%s - %s"),
 			TranslateT("Spell Checker"), languages[i]->full_name);
 		sid.tszTooltip = tmp;
-		sid.hIcon = (opts.use_flags) ? Skin_GetIconByHandle(languages[i]->hIcolib) : Skin_GetIcon("spellchecker_enabled");
+		sid.hIcon = (opts.use_flags) ? IcoLib_GetIconByHandle(languages[i]->hIcolib) : IcoLib_GetIcon("spellchecker_enabled");
 		Srmm_AddIcon(&sid);
 	}
 
diff --git a/plugins/SpellChecker/src/utils.cpp b/plugins/SpellChecker/src/utils.cpp
index f985951c90..ab777aa39c 100644
--- a/plugins/SpellChecker/src/utils.cpp
+++ b/plugins/SpellChecker/src/utils.cpp
@@ -1506,12 +1506,12 @@ LRESULT CALLBACK MenuWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 

 			// Draw icon

 			if (dict->hIcolib) {

-				HICON hFlag = Skin_GetIconByHandle(dict->hIcolib);

+				HICON hFlag = IcoLib_GetIconByHandle(dict->hIcolib);

 

 				rc.top = (lpdis->rcItem.bottom + lpdis->rcItem.top - ICON_SIZE) / 2;

 				DrawIconEx(lpdis->hDC, rc.left, rc.top, hFlag, 16, 16, 0, NULL, DI_NORMAL);

 

-				Skin_ReleaseIcon(hFlag);

+				IcoLib_ReleaseIcon(hFlag);

 

 				rc.left += ICON_SIZE + 4;

 			}