diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-11-30 21:20:14 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-11-30 21:20:14 +0000 |
| commit | d9c98bcdfca6da51a1a82dc6c0dc5996b3b6cd6d (patch) | |
| tree | a6f925c63bc31e4b4dba301183cc3b429d52d816 /plugins/ModernOpt | |
| parent | ce2d4f19e3f810b282eb7d47d470d426ff459e1f (diff) | |
new sorting functions applied
git-svn-id: http://svn.miranda-ng.org/main/trunk@11180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/ModernOpt')
| -rw-r--r-- | plugins/ModernOpt/src/modernopt.cpp | 4 | ||||
| -rw-r--r-- | plugins/ModernOpt/src/mopt_selector.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp index da85a22ad9..9d696e30b6 100644 --- a/plugins/ModernOpt/src/modernopt.cpp +++ b/plugins/ModernOpt/src/modernopt.cpp @@ -121,7 +121,7 @@ static int ModernOptionsObject_Comparator(const ModernOptionsObject *ptr1, const if (obj1->optObject.lptzSubsection && obj2->optObject.lptzSubsection)
{
- int c = lstrcmp(obj1->optObject.lptzSubsection, obj2->optObject.lptzSubsection);
+ int c = mir_tstrcmp(obj1->optObject.lptzSubsection, obj2->optObject.lptzSubsection);
if (c) return c;
}
@@ -378,7 +378,7 @@ static int lstrcmp_null(TCHAR *p1, TCHAR *p2) if (!p1 && !p2) return 0;
if (!p1) return -1;
if (!p2) return 1;
- return lstrcmp(p1, p2);
+ return mir_tstrcmp(p1, p2);
}
static void ModernOptUI_ShowPage(HWND hwndDlg, struct ModernOptionsData *dat, int iPage)
diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp index 0c923acfcb..ce5145cfa9 100644 --- a/plugins/ModernOpt/src/mopt_selector.cpp +++ b/plugins/ModernOpt/src/mopt_selector.cpp @@ -129,7 +129,7 @@ struct TSelectorData static bool CheckExt(TCHAR *fn, TCHAR *ext, int n)
{
int l = mir_tstrlen(fn);
- return (l > n) && !lstrcmp(fn + l - n, ext);
+ return (l > n) && !mir_tstrcmp(fn + l - n, ext);
}
static void BuildSkinList(HWND hwndList, TCHAR *szExt, int nExtLength = -1, bool start = true)
@@ -148,7 +148,7 @@ static void BuildSkinList(HWND hwndList, TCHAR *szExt, int nExtLength = -1, bool HANDLE h = FindFirstFile(_T("*.*"), &ffd);
if (h != INVALID_HANDLE_VALUE) {
do {
- if (!lstrcmp(ffd.cFileName, _T("")) || !lstrcmp(ffd.cFileName, _T(".")) || !lstrcmp(ffd.cFileName, _T("..")))
+ if (!mir_tstrcmp(ffd.cFileName, _T("")) || !mir_tstrcmp(ffd.cFileName, _T(".")) || !mir_tstrcmp(ffd.cFileName, _T("..")))
continue;
if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
@@ -315,7 +315,7 @@ INT_PTR CALLBACK ModernOptSelector_DlgProc(HWND hwndDlg, UINT msg, WPARAM wPara int cxIcon = GetSystemMetrics(SM_CXSMICON);
int cyIcon = GetSystemMetrics(SM_CYSMICON);
- if (sd->active && !lstrcmp(sd->active, dat->filename)) {
+ if (sd->active && !mir_tstrcmp(sd->active, dat->filename)) {
DrawIconEx(lps->hDC, lps->rcItem.left, (lps->rcItem.top+lps->rcItem.bottom-cyIcon)/2,
LoadSkinnedIcon(SKINICON_OTHER_EMPTYBLOB),
cxIcon, cyIcon, 0, NULL, DI_NORMAL);
|