SendDlgItemMessage(...BM_SETCHECK ...) -> CheckDlgButton(...)

SendDlgItemMessage(...BM_GETCHECK ...) -> IsDlgButtonChecked(...)
constants fix for CheckDlgButton()



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

3 files changed, 20 insertions, 20 deletions

diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp
index dce15b01c0..8973d56f70 100644
--- a/plugins/Weather/src/weather_contacts.cpp
+++ b/plugins/Weather/src/weather_contacts.cpp
@@ -185,7 +185,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 		if ( !db_get_ts(hContact, WEATHERPROTONAME, "ID", &dbv)) {

 			SetDlgItemText(hwndDlg, IDC_ID, dbv.ptszVal);

 			// check if the station is a default station

-			CheckDlgButton(hwndDlg, IDC_DEFA, _tcscmp(dbv.ptszVal, opt.Default) != 0);

+			CheckDlgButton(hwndDlg, IDC_DEFA, _tcscmp(dbv.ptszVal, opt.Default) != 0 ? BST_CHECKED : BST_UNCHECKED);

 			db_free(&dbv);

 		}

 		if ( !db_get_ts(hContact, WEATHERPROTONAME, "Nick", &dbv)) {

@@ -195,16 +195,16 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 		if ( !db_get_ts(hContact, WEATHERPROTONAME, "Log", &dbv)) {

 			SetDlgItemText(hwndDlg, IDC_LOG, dbv.ptszVal);

 			// if the log path is not empty, check the checkbox for external log

-			if (dbv.ptszVal[0]) CheckDlgButton(hwndDlg, IDC_External, TRUE);

+			if (dbv.ptszVal[0]) CheckDlgButton(hwndDlg, IDC_External, BST_CHECKED);

 			db_free(&dbv);

 		}

 		// enable/disable the browse button depending on the value of external log checkbox

 		EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE), (BYTE)IsDlgButtonChecked(hwndDlg, IDC_External));

 

 		// other checkbox options

-		CheckDlgButton(hwndDlg, IDC_DPop, db_get_b(hContact, WEATHERPROTONAME, "DPopUp", FALSE));

-		CheckDlgButton(hwndDlg, IDC_DAutoUpdate, db_get_b(hContact, WEATHERPROTONAME, "DAutoUpdate", FALSE));

-		CheckDlgButton(hwndDlg, IDC_Internal, db_get_b(hContact, WEATHERPROTONAME, "History", 0));

+		CheckDlgButton(hwndDlg, IDC_DPop, db_get_b(hContact, WEATHERPROTONAME, "DPopUp", FALSE) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_DAutoUpdate, db_get_b(hContact, WEATHERPROTONAME, "DAutoUpdate", FALSE) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_Internal, db_get_b(hContact, WEATHERPROTONAME, "History", 0) ? BST_CHECKED : BST_UNCHECKED);

 

 		if ( !db_get_ts(hContact, WEATHERPROTONAME, "InfoURL", &dbv)) {

 			SetDlgItemText(hwndDlg, IDC_IURL, dbv.ptszVal);

diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp
index c43ddbd60b..315c7ccbb5 100644
--- a/plugins/Weather/src/weather_opt.cpp
+++ b/plugins/Weather/src/weather_opt.cpp
@@ -309,15 +309,15 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 		SendDlgItemMessage(hdlg, IDC_AVATARSPIN, UDM_SETPOS, 0, opt.AvatarSize);

 		SendDlgItemMessage(hdlg, IDC_AVATARSIZE, EM_LIMITTEXT, 3, 0);

 

-		CheckDlgButton(hdlg, IDC_STARTUPUPD, opt.StartupUpdate);

-		CheckDlgButton(hdlg, IDC_UPDATE, opt.AutoUpdate);

-		CheckDlgButton(hdlg, IDC_PROTOCOND, !opt.NoProtoCondition);

-		CheckDlgButton(hdlg, IDC_UPDCONDCHG, opt.UpdateOnlyConditionChanged);

-		CheckDlgButton(hdlg, IDC_REMOVEOLD, opt.RemoveOldData);

-		CheckDlgButton(hdlg, IDC_MAKEI, opt.MakeItalic);

-		CheckDlgButton(hdlg, IDC_DISCONDICON, opt.DisCondIcon);

-		CheckDlgButton(hdlg, IDC_DONOTAPPUNITS, opt.DoNotAppendUnit);

-		CheckDlgButton(hdlg, IDC_NOFRAC, opt.NoFrac);

+		CheckDlgButton(hdlg, IDC_STARTUPUPD, opt.StartupUpdate ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_UPDATE, opt.AutoUpdate ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_PROTOCOND, !opt.NoProtoCondition ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_UPDCONDCHG, opt.UpdateOnlyConditionChanged ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_REMOVEOLD, opt.RemoveOldData ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_MAKEI, opt.MakeItalic ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_DISCONDICON, opt.DisCondIcon ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_DONOTAPPUNITS, opt.DoNotAppendUnit ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_NOFRAC, opt.NoFrac ? BST_CHECKED : BST_UNCHECKED);

 

 		// load units

 		switch (opt.tUnit) {	// temperature

@@ -383,7 +383,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam)
 			GetDlgItemText(hdlg, IDC_DEGREE, opt.DegreeSign, SIZEOF(opt.DegreeSign));

 			opt.StartupUpdate = IsDlgButtonChecked(hdlg, IDC_STARTUPUPD);

 			opt.AutoUpdate = IsDlgButtonChecked(hdlg, IDC_UPDATE);

-			opt.NoProtoCondition = !IsDlgButtonChecked(hdlg, IDC_PROTOCOND);

+			opt.NoProtoCondition = BST_UNCHECKED == IsDlgButtonChecked(hdlg, IDC_PROTOCOND);

 			opt.DisCondIcon = IsDlgButtonChecked(hdlg, IDC_DISCONDICON);

 			opt.UpdateOnlyConditionChanged = (BYTE)IsDlgButtonChecked(hdlg, IDC_UPDCONDCHG);

 			opt.RemoveOldData = IsDlgButtonChecked(hdlg, IDC_REMOVEOLD);

diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp
index f74c570f1a..68d349b77c 100644
--- a/plugins/Weather/src/weather_popup.cpp
+++ b/plugins/Weather/src/weather_popup.cpp
@@ -265,11 +265,11 @@ INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 		DestroyMenu(hMenu);

 

 		// other options

-		CheckDlgButton(hdlg, IDC_E, opt.UsePopup);

-		CheckDlgButton(hdlg, IDC_POP2, opt.AlertPopup);

-		CheckDlgButton(hdlg, IDC_POP1, opt.UpdatePopup);

-		CheckDlgButton(hdlg, IDC_CH, opt.PopupOnChange);

-		CheckDlgButton(hdlg, IDC_W, opt.ShowWarnings);

+		CheckDlgButton(hdlg, IDC_E, opt.UsePopup ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_POP2, opt.AlertPopup ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_POP1, opt.UpdatePopup ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_CH, opt.PopupOnChange ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hdlg, IDC_W, opt.ShowWarnings ? BST_CHECKED : BST_UNCHECKED);

 		SetDlgItemText(hdlg,IDC_PText, opt.pText);

 		SetDlgItemText(hdlg,IDC_PTitle, opt.pTitle);

 		// setting popup delay option