From 365183d00b2eaad4d7c1a38bf346c6635e2c8031 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 16 Aug 2015 16:49:08 +0000
Subject: fix for conversion from HBRUSH to BOOL

git-svn-id: http://svn.miranda-ng.org/main/trunk@14967 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 .../UserInfoEx/src/ex_import/dlg_ExImProgress.cpp  |  3 -
 plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp   | 64 +++++++++++-----------
 2 files changed, 32 insertions(+), 35 deletions(-)

(limited to 'plugins/UserInfoEx/src/ex_import')

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
index 5d242d12a5..b18a8761c3 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
@@ -55,14 +55,11 @@ INT_PTR CALLBACK DlgProcProgress(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		}
 		case WM_CTLCOLORSTATIC:
 			switch (GetWindowLongPtr((HWND)lParam, GWLP_ID)) {
-				//case IDC_HEADERBAR
 				case STATIC_WHITERECT:
 				case TXT_SETTING:
 				case IDC_PROGRESS:
 				case TXT_CONTACT:
 				case IDC_PROGRESS2:
-				//case ICO_DLGLOGO:
-				//case IDC_INFO:
 					SetBkColor((HDC)wParam, RGB(255, 255, 255));
 					return (INT_PTR)GetStockObject(WHITE_BRUSH);
 			}
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
index c7f473e83f..692cf79e9d 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
@@ -25,9 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 INT_PTR CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	switch (msg) 
-	{
-		case WM_INITDIALOG:
+	switch (msg) {
+	case WM_INITDIALOG:
+		TranslateDialogDefault(hDlg);
 		{
 			const ICONCTRL idIcon[] = {
 				{ ICO_DLG_EXPORT,	WM_SETICON,		NULL		},
@@ -38,39 +38,39 @@ INT_PTR CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 			const int numIconsToSet = db_get_b(NULL, MODNAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2;
 			IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet);
 
-			TranslateDialogDefault(hDlg);
 			SendDlgItemMessage(hDlg, IDOK, BUTTONTRANSLATE, NULL, NULL);
 			SendDlgItemMessage(hDlg, IDCANCEL, BUTTONTRANSLATE, NULL, NULL);
-			break;
 		}
-		case WM_CTLCOLORSTATIC:
-			switch (GetWindowLongPtr((HWND)lParam, GWLP_ID)) {
-				case STATIC_WHITERECT:
-				case ICO_DLGLOGO:
-				case IDC_INFO:
-					SetBkColor((HDC)wParam, RGB(255, 255, 255));
-					return (INT_PTR)GetStockObject(WHITE_BRUSH);
-			}
-			return FALSE;
-		case WM_COMMAND:
-			if (HIWORD(wParam) == BN_CLICKED) {
-				switch (LOWORD(wParam)) {
-					case IDCANCEL:
-						EndDialog(hDlg, 0);
-						break;
-					case IDOK: {
-						WORD hiWord = 0;
-
-						if (IsDlgButtonChecked(hDlg, IDC_CHECK1))
-							hiWord |= EXPORT_DATA;
-						if (IsDlgButtonChecked(hDlg, IDC_CHECK2))
-							hiWord |= EXPORT_HISTORY;
-						EndDialog(hDlg, (INT_PTR)MAKELONG(IDOK, hiWord));
-						break;
-					}
-				}
+		break;
+
+	case WM_CTLCOLORSTATIC:
+		switch (GetWindowLongPtr((HWND)lParam, GWLP_ID)) {
+		case STATIC_WHITERECT:
+		case ICO_DLGLOGO:
+		case IDC_INFO:
+			SetBkColor((HDC)wParam, RGB(255, 255, 255));
+			return (INT_PTR)GetStockObject(WHITE_BRUSH);
+		}
+		return FALSE;
+
+	case WM_COMMAND:
+		if (HIWORD(wParam) == BN_CLICKED) {
+			switch (LOWORD(wParam)) {
+			case IDCANCEL:
+				EndDialog(hDlg, 0);
+				break;
+
+			case IDOK:
+				WORD hiWord = 0;
+				if (IsDlgButtonChecked(hDlg, IDC_CHECK1))
+					hiWord |= EXPORT_DATA;
+				if (IsDlgButtonChecked(hDlg, IDC_CHECK2))
+					hiWord |= EXPORT_HISTORY;
+				EndDialog(hDlg, (INT_PTR)MAKELONG(IDOK, hiWord));
+				break;
 			}
-			break;
+		}
+		break;
 	}
 	return FALSE;
 }
-- 
cgit v1.2.3