From c992cb2fdc11f1cac4bc5cbce26e8e2bb3b57da0 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 26 Jun 2012 16:50:14 +0000
Subject: - microkernel addded; - version bumped to 0.92.2

git-svn-id: http://svn.miranda-ng.org/main/trunk@641 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/icolib/IcoLib.h       |  2 +-
 src/modules/icolib/skin2icons.cpp |  6 +++---
 src/modules/icolib/skin2opts.cpp  | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/modules/icolib')

diff --git a/src/modules/icolib/IcoLib.h b/src/modules/icolib/IcoLib.h
index 30121729a8..550de7ad9b 100644
--- a/src/modules/icolib/IcoLib.h
+++ b/src/modules/icolib/IcoLib.h
@@ -75,7 +75,7 @@ struct IconItem
 	HICON        temp_icon;
 	BOOL         temp_reset;
 
-	__inline TCHAR* getDescr() const { return LangPackTranslateStringT(hLangpack, description); }
+	__inline TCHAR* getDescr() const { return TranslateTH(hLangpack, description); }
 };
 
 // extracticon.c
diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp
index 2d6d9ab9cd..7001bbae3b 100644
--- a/src/modules/icolib/skin2icons.cpp
+++ b/src/modules/icolib/skin2icons.cpp
@@ -112,7 +112,7 @@ IconSourceFile* IconSourceFile_Get(const TCHAR* file, bool isPath)
 		return NULL;
 
     if (isPath)
-		 pathToAbsoluteT(file, fileFull, NULL);
+		 PathToAbsoluteT(file, fileFull, NULL);
 		 /// TODO: convert path to long - eliminate duplicate items
 	 else
 		 _tcscpy(fileFull, file);
@@ -534,9 +534,9 @@ HANDLE IcoLib_AddNewIcon(int hLangpack, SKINICONDESC* sid)
 	if (sid->pszDefaultFile) {
 		WCHAR fileFull[ MAX_PATH ];
 		if (utf_path)
-			pathToAbsoluteT(sid->pwszDefaultFile, fileFull, NULL);
+			PathToAbsoluteT(sid->pwszDefaultFile, fileFull, NULL);
 		else
-			pathToAbsoluteT( StrConvT(sid->pszDefaultFile), fileFull, NULL);
+			PathToAbsoluteT( StrConvT(sid->pszDefaultFile), fileFull, NULL);
 		item->default_file = mir_wstrdup(fileFull);
 	}
 	item->default_indx = sid->iDefaultIndex;
diff --git a/src/modules/icolib/skin2opts.cpp b/src/modules/icolib/skin2opts.cpp
index 0d230d7930..9c6f3f2a41 100644
--- a/src/modules/icolib/skin2opts.cpp
+++ b/src/modules/icolib/skin2opts.cpp
@@ -56,7 +56,7 @@ static HICON ExtractIconFromPath(const TCHAR *path, int cxIcon, int cyIcon)
 		n = _ttoi(comma+1);
 		*comma = 0;
 	}
-	pathToAbsoluteT(file, fileFull, NULL);
+	PathToAbsoluteT(file, fileFull, NULL);
 	hIcon = NULL;
 
 	//SHOULD BE REPLACED WITH GOOD ENOUGH FUNCTION
@@ -242,7 +242,7 @@ static int OpenPopupMenu(HWND hwndDlg)
 	int cmd;
 
 	GetCursorPos(&pt);
-	hMenu = LoadMenu(hMirandaInst, MAKEINTRESOURCE(IDR_ICOLIB_CONTEXT));
+	hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_ICOLIB_CONTEXT));
 	hPopup = GetSubMenu(hMenu, 0);
 	TranslateMenu(hPopup);
 	cmd = TrackPopupMenu(hPopup, TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x,  pt.y, 0, hwndDlg, NULL);
@@ -586,7 +586,7 @@ INT_PTR CALLBACK DlgProcIconImport(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		if ( !IsIconic(hwndDlg)) { 
 			UTILRESIZEDIALOG urd = {0};
 			urd.cbSize = sizeof(urd);
-			urd.hInstance = hMirandaInst;
+			urd.hInstance = hInst;
 			urd.hwndDlg = hwndDlg;
 			urd.lParam = 0; // user-defined
 			urd.lpTemplate = MAKEINTRESOURCEA(IDD_ICOLIB_IMPORT);
@@ -856,7 +856,7 @@ INT_PTR CALLBACK DlgProcIcoLibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 
 	case WM_COMMAND:
 		if (LOWORD(wParam) == IDC_IMPORT) {
-			dat->hwndIndex = CreateDialogParam(hMirandaInst, MAKEINTRESOURCE(IDD_ICOLIB_IMPORT), GetParent(hwndDlg), DlgProcIconImport, (LPARAM)hwndDlg);
+			dat->hwndIndex = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_ICOLIB_IMPORT), GetParent(hwndDlg), DlgProcIconImport, (LPARAM)hwndDlg);
 			EnableWindow((HWND)lParam, FALSE);
 		}
 		else if (LOWORD(wParam) == IDC_GETMORE) {
@@ -1037,7 +1037,7 @@ int SkinOptionsInit(WPARAM wParam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = {0};
 	odp.cbSize = sizeof(odp);
-	odp.hInstance = hMirandaInst;
+	odp.hInstance = hInst;
 	odp.flags = ODPF_BOLDGROUPS;
 	odp.position = -180000000;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICOLIB);
-- 
cgit v1.2.3