- MS_UTILS_GETBITMAPFILTERSTRINGS - end of story, replaced with BmpFilterGetStrings();

- parasite mir_strncat's removed from bitmap filter creation;
- CMString::AllocSysString/SetSysString removed due to complete uselessness;
- CMString::Detouch - typo fixed.

git-svn-id: http://svn.miranda-ng.org/main/trunk@13881 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index 9948c37ed3..23a6b172d4 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -740,26 +740,26 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 		Utils::enableDlgControl(hwndDlg, IDC_SCROLL, IsDlgButtonChecked(hwndDlg, IDC_BITMAP));

 		Utils::enableDlgControl(hwndDlg, IDC_PROPORTIONAL, IsDlgButtonChecked(hwndDlg, IDC_BITMAP));

 		break;

+	

 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_BROWSE) {

-			char str[MAX_PATH];

-			OPENFILENAMEA ofn = { 0 };

-			char filter[512];

+			TCHAR str[MAX_PATH], filter[512];

+			GetDlgItemText(hwndDlg, IDC_FILENAME, str, SIZEOF(str));

+			BmpFilterGetStrings(filter, SIZEOF(filter));

 

-			GetDlgItemTextA(hwndDlg, IDC_FILENAME, str, SIZEOF(str));

+			OPENFILENAME ofn = { 0 };

 			ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400;

 			ofn.hwndOwner = hwndDlg;

 			ofn.hInstance = NULL;

-			CallService(MS_UTILS_GETBITMAPFILTERSTRINGS, sizeof(filter), (LPARAM)filter);

 			ofn.lpstrFilter = filter;

 			ofn.lpstrFile = str;

 			ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;

 			ofn.nMaxFile = SIZEOF(str);

 			ofn.nMaxFileTitle = MAX_PATH;

-			ofn.lpstrDefExt = "bmp";

-			if (!GetOpenFileNameA(&ofn))

+			ofn.lpstrDefExt = _T("bmp");

+			if (!GetOpenFileName(&ofn))

 				break;

-			SetDlgItemTextA(hwndDlg, IDC_FILENAME, str);

+			SetDlgItemText(hwndDlg, IDC_FILENAME, str);

 		}

 		else if (LOWORD(wParam) == IDC_FILENAME && HIWORD(wParam) != EN_CHANGE)

 			break;