From fe0465b11a317db5408d897484caedc3a5f10c47 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sun, 14 Dec 2014 03:42:51 +0000 Subject: 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 --- protocols/JabberG/src/jabber_adhoc.cpp | 2 +- protocols/JabberG/src/jabber_bookmarks.cpp | 14 ++++++------- protocols/JabberG/src/jabber_console.cpp | 6 +++--- protocols/JabberG/src/jabber_disco.cpp | 16 +++++++-------- protocols/JabberG/src/jabber_groupchat.cpp | 4 ++-- protocols/JabberG/src/jabber_privacy.cpp | 20 +++++++++---------- protocols/JabberG/src/jabber_thread.cpp | 2 +- protocols/JabberG/src/jabber_vcard.cpp | 32 +++++++++++++++--------------- 8 files changed, 48 insertions(+), 48 deletions(-) (limited to 'protocols/JabberG') diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp index fc58e02e47..5590c80f51 100644 --- a/protocols/JabberG/src/jabber_adhoc.cpp +++ b/protocols/JabberG/src/jabber_adhoc.cpp @@ -119,7 +119,7 @@ int CJabberProto::AdHoc_ExecuteCommand(HWND hwndDlg, TCHAR*, JabberAdHocData* da if (!itemNode) break; - if (!IsDlgButtonChecked(GetDlgItem(hwndDlg, IDC_FRAME), i)) + if (BST_UNCHECKED == IsDlgButtonChecked(GetDlgItem(hwndDlg, IDC_FRAME), i)) continue; const TCHAR *node = xmlGetAttrValue(itemNode, _T("node")); diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp index 096829ecfb..132282a4ae 100644 --- a/protocols/JabberG/src/jabber_bookmarks.cpp +++ b/protocols/JabberG/src/jabber_bookmarks.cpp @@ -49,17 +49,17 @@ static INT_PTR CALLBACK JabberAddBookmarkDlgProc(HWND hwndDlg, UINT msg, WPARAM if (item = param->m_item) { if (!mir_tstrcmp(item->type, _T("conference"))) { if (!_tcschr(item->jid, _T('@'))) { //no room name - consider it is transport - SendDlgItemMessage(hwndDlg, IDC_AGENT_RADIO, BM_SETCHECK, BST_CHECKED, 0); + CheckDlgButton(hwndDlg, IDC_AGENT_RADIO, BST_CHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_NICK), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_PASSWORD), FALSE); } - else SendDlgItemMessage(hwndDlg, IDC_ROOM_RADIO, BM_SETCHECK, BST_CHECKED, 0); + else CheckDlgButton(hwndDlg, IDC_ROOM_RADIO, BST_CHECKED); } else { - SendDlgItemMessage(hwndDlg, IDC_URL_RADIO, BM_SETCHECK, BST_CHECKED, 0); + CheckDlgButton(hwndDlg, IDC_URL_RADIO, BST_CHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_NICK), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_PASSWORD), FALSE); - SendDlgItemMessage(hwndDlg, IDC_CHECK_BM_AUTOJOIN, BM_SETCHECK, BST_UNCHECKED, 0); + CheckDlgButton(hwndDlg, IDC_CHECK_BM_AUTOJOIN, BST_UNCHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_CHECK_BM_AUTOJOIN), FALSE); } @@ -72,13 +72,13 @@ static INT_PTR CALLBACK JabberAddBookmarkDlgProc(HWND hwndDlg, UINT msg, WPARAM if (item->name) SetDlgItemText(hwndDlg, IDC_NAME, item->name); if (item->nick) SetDlgItemText(hwndDlg, IDC_NICK, item->nick); if (item->password) SetDlgItemText(hwndDlg, IDC_PASSWORD, item->password); - if (item->bAutoJoin) SendDlgItemMessage(hwndDlg, IDC_CHECK_BM_AUTOJOIN, BM_SETCHECK, BST_CHECKED, 0); + if (item->bAutoJoin) CheckDlgButton(hwndDlg, IDC_CHECK_BM_AUTOJOIN, BST_CHECKED); if (IsDlgButtonChecked(hwndDlg, IDC_ROOM_RADIO) == BST_CHECKED) EnableWindow(GetDlgItem(hwndDlg, IDC_CHECK_BM_AUTOJOIN), TRUE); } else { EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - SendDlgItemMessage(hwndDlg, IDC_ROOM_RADIO, BM_SETCHECK, BST_CHECKED, 0); + CheckDlgButton(hwndDlg, IDC_ROOM_RADIO, BST_CHECKED); } return TRUE; @@ -95,7 +95,7 @@ static INT_PTR CALLBACK JabberAddBookmarkDlgProc(HWND hwndDlg, UINT msg, WPARAM case IDC_URL_RADIO: EnableWindow(GetDlgItem(hwndDlg, IDC_NICK), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_PASSWORD), FALSE); - SendDlgItemMessage(hwndDlg, IDC_CHECK_BM_AUTOJOIN, BM_SETCHECK, BST_UNCHECKED, 0); + CheckDlgButton(hwndDlg, IDC_CHECK_BM_AUTOJOIN, BST_UNCHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_CHECK_BM_AUTOJOIN), FALSE); break; } diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp index bc5cf87266..b67a049bc7 100644 --- a/protocols/JabberG/src/jabber_console.cpp +++ b/protocols/JabberG/src/jabber_console.cpp @@ -379,7 +379,7 @@ void CJabberDlgConsole::OnInitDialog() SendDlgItemMessage(m_hwnd, buttons[i].idc, BUTTONSETASFLATBTN, TRUE, 0); SendDlgItemMessage(m_hwnd, buttons[i].idc, BUTTONADDTOOLTIP, (WPARAM)buttons[i].title, 0); if (buttons[i].push) SendDlgItemMessage(m_hwnd, buttons[i].idc, BUTTONSETASPUSHBTN, TRUE, 0); - if (buttons[i].pushed) CheckDlgButton(m_hwnd, buttons[i].idc, TRUE); + if (buttons[i].pushed) CheckDlgButton(m_hwnd, buttons[i].idc, BST_CHECKED); } for (i=0; i < SIZEOF(filter_modes); i++) @@ -575,9 +575,9 @@ INT_PTR CJabberDlgConsole::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) filter_modes[i].type + 1, TranslateTS(filter_modes[i].title)); RECT rc; GetWindowRect(GetDlgItem(m_hwnd, IDC_BTN_FILTER), &rc); - CheckDlgButton(m_hwnd, IDC_BTN_FILTER, TRUE); + CheckDlgButton(m_hwnd, IDC_BTN_FILTER, BST_CHECKED); int res = TrackPopupMenu(hMenu, TPM_RETURNCMD | TPM_BOTTOMALIGN, rc.left, rc.top, 0, m_hwnd, NULL); - CheckDlgButton(m_hwnd, IDC_BTN_FILTER, FALSE); + CheckDlgButton(m_hwnd, IDC_BTN_FILTER, BST_UNCHECKED); DestroyMenu(hMenu); if (res) { diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index 4c21802990..cdb471cf1a 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -648,7 +648,7 @@ void CJabberDlgDiscovery::OnInitDialog() m_btnViewAsTree.MakePush(); m_btnBookmarks.MakePush(); - CheckDlgButton(m_hwnd, m_proto->getByte("discoWnd_useTree", 1) ? IDC_BTN_VIEWTREE : IDC_BTN_VIEWLIST, TRUE); + CheckDlgButton(m_hwnd, m_proto->getByte("discoWnd_useTree", 1) ? IDC_BTN_VIEWTREE : IDC_BTN_VIEWLIST, BST_CHECKED); EnableWindow(GetDlgItem(m_hwnd, IDC_BTN_FILTERRESET), FALSE); @@ -776,15 +776,15 @@ int CJabberDlgDiscovery::Resizer(UTILRESIZECONTROL *urc) void CJabberDlgDiscovery::btnViewAsTree_OnClick(CCtrlButton *) { - CheckDlgButton(m_hwnd, IDC_BTN_VIEWLIST, FALSE); - CheckDlgButton(m_hwnd, IDC_BTN_VIEWTREE, TRUE); + CheckDlgButton(m_hwnd, IDC_BTN_VIEWLIST, BST_UNCHECKED); + CheckDlgButton(m_hwnd, IDC_BTN_VIEWTREE, BST_CHECKED); TreeList_SetMode(GetDlgItem(m_hwnd, IDC_TREE_DISCO), TLM_TREE); } void CJabberDlgDiscovery::btnViewAsList_OnClick(CCtrlButton *) { - CheckDlgButton(m_hwnd, IDC_BTN_VIEWLIST, TRUE); - CheckDlgButton(m_hwnd, IDC_BTN_VIEWTREE, FALSE); + CheckDlgButton(m_hwnd, IDC_BTN_VIEWLIST, BST_CHECKED); + CheckDlgButton(m_hwnd, IDC_BTN_VIEWTREE, BST_UNCHECKED); TreeList_SetMode(GetDlgItem(m_hwnd, IDC_TREE_DISCO), TLM_REPORT); } @@ -825,9 +825,9 @@ void CJabberDlgDiscovery::btnBookmarks_OnClick(CCtrlButton *) AppendMenu(hMenu, MF_STRING, 10+SD_BROWSE_CONFERENCES, TranslateT("Browse chatrooms")); RECT rc; GetWindowRect(GetDlgItem(m_hwnd, IDC_BTN_FAVORITE), &rc); - CheckDlgButton(m_hwnd, IDC_BTN_FAVORITE, TRUE); + CheckDlgButton(m_hwnd, IDC_BTN_FAVORITE, BST_CHECKED); res = TrackPopupMenu(hMenu, TPM_RETURNCMD, rc.left, rc.bottom, 0, m_hwnd, NULL); - CheckDlgButton(m_hwnd, IDC_BTN_FAVORITE, FALSE); + CheckDlgButton(m_hwnd, IDC_BTN_FAVORITE, BST_UNCHECKED); DestroyMenu(hMenu); if (res >= 100) { @@ -892,7 +892,7 @@ void CJabberDlgDiscovery::btnBookmarks_OnClick(CCtrlButton *) PostMessage(m_hwnd, WM_COMMAND, MAKEWPARAM(IDC_BUTTON_BROWSE, 0), 0); } - CheckDlgButton(m_hwnd, IDC_BTN_FAVORITE, FALSE); + CheckDlgButton(m_hwnd, IDC_BTN_FAVORITE, BST_UNCHECKED); } void CJabberDlgDiscovery::btnRefresh_OnClick(CCtrlButton *) diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index 673332e484..99a24ee972 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -640,9 +640,9 @@ INT_PTR CJabberDlgGcJoin::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) AppendMenu(hMenu, MF_STRING, (UINT_PTR)0, TranslateT("Cancel")); RECT rc; GetWindowRect(GetDlgItem(m_hwnd, IDC_BOOKMARKS), &rc); - CheckDlgButton(m_hwnd, IDC_BOOKMARKS, TRUE); + CheckDlgButton(m_hwnd, IDC_BOOKMARKS, BST_CHECKED); int res = TrackPopupMenu(hMenu, TPM_RETURNCMD, rc.left, rc.bottom, 0, m_hwnd, NULL); - CheckDlgButton(m_hwnd, IDC_BOOKMARKS, FALSE); + CheckDlgButton(m_hwnd, IDC_BOOKMARKS, BST_UNCHECKED); DestroyMenu(hMenu); if (res == -1) diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index 84965993ad..3042db1b4e 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -390,13 +390,13 @@ public: if (!dwPackets) dwPackets = JABBER_PL_RULE_TYPE_ALL; if (dwPackets & JABBER_PL_RULE_TYPE_IQ) - SendDlgItemMessage(m_hwnd, IDC_CHECK_QUERIES, BM_SETCHECK, BST_CHECKED, 0); + CheckDlgButton(m_hwnd, IDC_CHECK_QUERIES, BST_CHECKED); if (dwPackets & JABBER_PL_RULE_TYPE_MESSAGE) - SendDlgItemMessage(m_hwnd, IDC_CHECK_MESSAGES, BM_SETCHECK, BST_CHECKED, 0); + CheckDlgButton(m_hwnd, IDC_CHECK_MESSAGES, BST_CHECKED); if (dwPackets & JABBER_PL_RULE_TYPE_PRESENCE_IN) - SendDlgItemMessage(m_hwnd, IDC_CHECK_PRESENCE_IN, BM_SETCHECK, BST_CHECKED, 0); + CheckDlgButton(m_hwnd, IDC_CHECK_PRESENCE_IN, BST_CHECKED); if (dwPackets & JABBER_PL_RULE_TYPE_PRESENCE_OUT) - SendDlgItemMessage(m_hwnd, IDC_CHECK_PRESENCE_OUT, BM_SETCHECK, BST_CHECKED, 0); + CheckDlgButton(m_hwnd, IDC_CHECK_PRESENCE_OUT, BST_CHECKED); if (m_pRule->GetValue() && (m_pRule->GetType() == Jid || m_pRule->GetType() == Group)) SetDlgItemText(m_hwnd, IDC_EDIT_VALUE, m_pRule->GetValue()); @@ -815,12 +815,12 @@ void CJabberDlgPrivacyLists::OnInitDialog() if ( m_proto->getByte("plistsWnd_simpleMode", 1)) { UIShowControls(m_hwnd, idSimpleControls, SW_SHOW); UIShowControls(m_hwnd, idAdvancedControls, SW_HIDE); - CheckDlgButton(m_hwnd, IDC_BTN_SIMPLE, TRUE); + CheckDlgButton(m_hwnd, IDC_BTN_SIMPLE, BST_CHECKED); } else { UIShowControls(m_hwnd, idSimpleControls, SW_HIDE); UIShowControls(m_hwnd, idAdvancedControls, SW_SHOW); - CheckDlgButton(m_hwnd, IDC_BTN_ADVANCED, TRUE); + CheckDlgButton(m_hwnd, IDC_BTN_ADVANCED, BST_CHECKED); } mir_subclassWindow( GetDlgItem(m_hwnd, IDC_LB_LISTS), LstListsSubclassProc); @@ -1611,8 +1611,8 @@ BOOL CJabberDlgPrivacyLists::CanExit() void CJabberDlgPrivacyLists::btnSimple_OnClick(CCtrlButton *) { - CheckDlgButton(m_hwnd, IDC_BTN_SIMPLE, TRUE); - CheckDlgButton(m_hwnd, IDC_BTN_ADVANCED, FALSE); + CheckDlgButton(m_hwnd, IDC_BTN_SIMPLE, BST_CHECKED); + CheckDlgButton(m_hwnd, IDC_BTN_ADVANCED, BST_UNCHECKED); UIShowControls(m_hwnd, idSimpleControls, SW_SHOW); UIShowControls(m_hwnd, idAdvancedControls, SW_HIDE); CListApplyList(GetDlgItem(m_hwnd, IDC_CLIST), GetSelectedList(m_hwnd)); @@ -1620,8 +1620,8 @@ void CJabberDlgPrivacyLists::btnSimple_OnClick(CCtrlButton *) void CJabberDlgPrivacyLists::btnAdvanced_OnClick(CCtrlButton *) { - CheckDlgButton(m_hwnd, IDC_BTN_SIMPLE, FALSE); - CheckDlgButton(m_hwnd, IDC_BTN_ADVANCED, TRUE); + CheckDlgButton(m_hwnd, IDC_BTN_SIMPLE, BST_UNCHECKED); + CheckDlgButton(m_hwnd, IDC_BTN_ADVANCED, BST_CHECKED); UIShowControls(m_hwnd, idSimpleControls, SW_HIDE); UIShowControls(m_hwnd, idAdvancedControls, SW_SHOW); CListBuildList(GetDlgItem(m_hwnd, IDC_CLIST), GetSelectedList(m_hwnd)); diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index b2dd0a460a..b9ddb3f2ed 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -88,7 +88,7 @@ static INT_PTR CALLBACK JabberPasswordDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_SAVE_PERM: - EnableWindow(GetDlgItem(hwndDlg, IDC_SAVEPASSWORD), !IsDlgButtonChecked(hwndDlg, IDC_SAVE_PERM)); + EnableWindow(GetDlgItem(hwndDlg, IDC_SAVEPASSWORD), BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_SAVE_PERM)); break; case IDOK: param->saveOnlinePassword = IsDlgButtonChecked(hwndDlg, IDC_SAVEPASSWORD); diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index 590b341425..f6af811edf 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -559,10 +559,10 @@ static INT_PTR CALLBACK EditEmailDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, mir_snprintf(idstr, SIZEOF(idstr), "e-mailFlag%d", lParam); WORD nFlag = dat->ppro->getWord(idstr, 0); - if (nFlag & JABBER_VCEMAIL_HOME) CheckDlgButton(hwndDlg, IDC_HOME, TRUE); - if (nFlag & JABBER_VCEMAIL_WORK) CheckDlgButton(hwndDlg, IDC_WORK, TRUE); - if (nFlag & JABBER_VCEMAIL_INTERNET) CheckDlgButton(hwndDlg, IDC_INTERNET, TRUE); - if (nFlag & JABBER_VCEMAIL_X400) CheckDlgButton(hwndDlg, IDC_X400, TRUE); + if (nFlag & JABBER_VCEMAIL_HOME) CheckDlgButton(hwndDlg, IDC_HOME, BST_CHECKED); + if (nFlag & JABBER_VCEMAIL_WORK) CheckDlgButton(hwndDlg, IDC_WORK, BST_CHECKED); + if (nFlag & JABBER_VCEMAIL_INTERNET) CheckDlgButton(hwndDlg, IDC_INTERNET, BST_CHECKED); + if (nFlag & JABBER_VCEMAIL_X400) CheckDlgButton(hwndDlg, IDC_X400, BST_CHECKED); } break; @@ -621,18 +621,18 @@ static INT_PTR CALLBACK EditPhoneDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, mir_snprintf(idstr, SIZEOF(idstr), "PhoneFlag%d", dat->id); int nFlag = dat->ppro->getWord(idstr, 0); - if (nFlag & JABBER_VCTEL_HOME) CheckDlgButton(hwndDlg, IDC_HOME, TRUE); - if (nFlag & JABBER_VCTEL_WORK) CheckDlgButton(hwndDlg, IDC_WORK, TRUE); - if (nFlag & JABBER_VCTEL_VOICE) CheckDlgButton(hwndDlg, IDC_VOICE, TRUE); - if (nFlag & JABBER_VCTEL_FAX) CheckDlgButton(hwndDlg, IDC_FAX, TRUE); - if (nFlag & JABBER_VCTEL_PAGER) CheckDlgButton(hwndDlg, IDC_PAGER, TRUE); - if (nFlag & JABBER_VCTEL_MSG) CheckDlgButton(hwndDlg, IDC_MSG, TRUE); - if (nFlag & JABBER_VCTEL_CELL) CheckDlgButton(hwndDlg, IDC_CELL, TRUE); - if (nFlag & JABBER_VCTEL_VIDEO) CheckDlgButton(hwndDlg, IDC_VIDEO, TRUE); - if (nFlag & JABBER_VCTEL_BBS) CheckDlgButton(hwndDlg, IDC_BBS, TRUE); - if (nFlag & JABBER_VCTEL_MODEM) CheckDlgButton(hwndDlg, IDC_MODEM, TRUE); - if (nFlag & JABBER_VCTEL_ISDN) CheckDlgButton(hwndDlg, IDC_ISDN, TRUE); - if (nFlag & JABBER_VCTEL_PCS) CheckDlgButton(hwndDlg, IDC_PCS, TRUE); + if (nFlag & JABBER_VCTEL_HOME) CheckDlgButton(hwndDlg, IDC_HOME, BST_CHECKED); + if (nFlag & JABBER_VCTEL_WORK) CheckDlgButton(hwndDlg, IDC_WORK, BST_CHECKED); + if (nFlag & JABBER_VCTEL_VOICE) CheckDlgButton(hwndDlg, IDC_VOICE, BST_CHECKED); + if (nFlag & JABBER_VCTEL_FAX) CheckDlgButton(hwndDlg, IDC_FAX, BST_CHECKED); + if (nFlag & JABBER_VCTEL_PAGER) CheckDlgButton(hwndDlg, IDC_PAGER, BST_CHECKED); + if (nFlag & JABBER_VCTEL_MSG) CheckDlgButton(hwndDlg, IDC_MSG, BST_CHECKED); + if (nFlag & JABBER_VCTEL_CELL) CheckDlgButton(hwndDlg, IDC_CELL, BST_CHECKED); + if (nFlag & JABBER_VCTEL_VIDEO) CheckDlgButton(hwndDlg, IDC_VIDEO, BST_CHECKED); + if (nFlag & JABBER_VCTEL_BBS) CheckDlgButton(hwndDlg, IDC_BBS, BST_CHECKED); + if (nFlag & JABBER_VCTEL_MODEM) CheckDlgButton(hwndDlg, IDC_MODEM, BST_CHECKED); + if (nFlag & JABBER_VCTEL_ISDN) CheckDlgButton(hwndDlg, IDC_ISDN, BST_CHECKED); + if (nFlag & JABBER_VCTEL_PCS) CheckDlgButton(hwndDlg, IDC_PCS, BST_CHECKED); } break; -- cgit v1.2.3