From d9c98bcdfca6da51a1a82dc6c0dc5996b3b6cd6d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 30 Nov 2014 21:20:14 +0000
Subject: new sorting functions applied

git-svn-id: http://svn.miranda-ng.org/main/trunk@11180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/options/filter.cpp  |  8 ++++----
 src/modules/options/options.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/modules/options')

diff --git a/src/modules/options/filter.cpp b/src/modules/options/filter.cpp
index d9e9f29c33..61f7461e62 100644
--- a/src/modules/options/filter.cpp
+++ b/src/modules/options/filter.cpp
@@ -85,13 +85,13 @@ void AddDialogString(HWND hWndDlg, const PageHash key)
 	TCHAR szClass[64];
 	GetClassName(hWndDlg, szClass, SIZEOF(szClass));
 
-	if (lstrcmpi(szClass, _T("SysTreeView32")) == 0) {
+	if (mir_tstrcmpi(szClass, _T("SysTreeView32")) == 0) {
 		HTREEITEM hItem = TreeView_GetRoot(hWndDlg);
 		AddTreeViewNodes(hWndDlg, key, hItem);
 		return;
 	}
 
-	if (lstrcmpi(szClass, _T("listbox")) == 0) {
+	if (mir_tstrcmpi(szClass, _T("listbox")) == 0) {
 		if (GetWindowStyle(hWndDlg) & LBS_HASSTRINGS) {
 			int count = ListBox_GetCount(hWndDlg);
 			for (int i=0; i < count; i++) {
@@ -107,7 +107,7 @@ void AddDialogString(HWND hWndDlg, const PageHash key)
 		return;
 	}
 
-	if (lstrcmpi(szClass, _T("SysListView32")) == 0) {
+	if (mir_tstrcmpi(szClass, _T("SysListView32")) == 0) {
 		int count = ListView_GetItemCount(hWndDlg);
 		for (int i=0; i < count; i++) {
 			title[0] = 0; //safety
@@ -119,7 +119,7 @@ void AddDialogString(HWND hWndDlg, const PageHash key)
 		return;
 	}
 
-	if (lstrcmpi(szClass, _T("combobox")) == 0) {
+	if (mir_tstrcmpi(szClass, _T("combobox")) == 0) {
 		if (GetWindowStyle(hWndDlg) & CBS_HASSTRINGS) {
 			int count = ComboBox_GetCount(hWndDlg);
 			for (int i=0; i < count; i++) {
diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp
index 74464fd333..21818343e7 100644
--- a/src/modules/options/options.cpp
+++ b/src/modules/options/options.cpp
@@ -154,7 +154,7 @@ static BOOL CALLBACK BoldGroupTitlesEnumChildren(HWND hwnd, LPARAM lParam)
 	TCHAR szClass[64];
 	GetClassName(hwnd, szClass, SIZEOF(szClass));
 
-	if (!lstrcmp(szClass, _T("Button")) && (GetWindowLongPtr(hwnd, GWL_STYLE) & 0x0F) == BS_GROUPBOX)
+	if (!mir_tstrcmp(szClass, _T("Button")) && (GetWindowLongPtr(hwnd, GWL_STYLE) & 0x0F) == BS_GROUPBOX)
 		SendMessage(hwnd, WM_SETFONT, lParam, 0);
 	return TRUE;
 }
@@ -198,7 +198,7 @@ static int lstrcmpnull(TCHAR *str1, TCHAR *str2)
 	if (str1 == NULL && str2 != NULL)
 		return -1;
 
-	return lstrcmp(str1, str2);
+	return mir_tstrcmp(str1, str2);
 }
 
 static TCHAR* GetPluginName(HINSTANCE hInstance, TCHAR *buffer, int size)
@@ -688,7 +688,7 @@ static BOOL IsInsideTab(HWND hdlg, OptionsDlgData *dat, int i)
 		for (int j = 0; j < dat->arOpd.getCount() && pages < 2; j++) {
 			OptionsPageData* opd2 = dat->arOpd[j];
 			if (!CheckPageShow(hdlg, dat, j)) continue;
-			if (lstrcmp(opd2->ptszTitle, opd->ptszTitle) || lstrcmpnull(opd2->ptszGroup, opd->ptszGroup))
+			if (mir_tstrcmp(opd2->ptszTitle, opd->ptszTitle) || lstrcmpnull(opd2->ptszGroup, opd->ptszGroup))
 				continue;
 			pages++;
 		}
@@ -873,7 +873,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
 				}
 				dat->arOpd.insert(opd);
 
-				if (!lstrcmp(lastPage, odp->ptszTitle) && !lstrcmpnull(lastGroup, odp->ptszGroup))
+				if (!mir_tstrcmp(lastPage, odp->ptszTitle) && !lstrcmpnull(lastGroup, odp->ptszGroup))
 					if ((ood->pszTab == NULL && dat->currentPage == -1) || !lstrcmpnull(lastTab, odp->ptszTab))
 						dat->currentPage = (int)i;
 			}
@@ -1029,13 +1029,13 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
 								continue;
 
 							OptionsPageData *p = dat->arOpd[i];
-							if (lstrcmp(opd->ptszTitle, p->ptszTitle) || lstrcmpnull(opd->ptszGroup, p->ptszGroup))
+							if (mir_tstrcmp(opd->ptszTitle, p->ptszTitle) || lstrcmpnull(opd->ptszGroup, p->ptszGroup))
 								continue;
 
 							tie.pszText = TranslateTH(p->hLangpack, p->ptszTab);
 							tie.lParam = i;
 							TabCtrl_InsertItem(hwndTab, pages, &tie);
-							if (!lstrcmp(opd->ptszTab, p->ptszTab))
+							if (!mir_tstrcmp(opd->ptszTab, p->ptszTab))
 								sel = pages;
 							pages++;
 						}
-- 
cgit v1.2.3