From 6bb048378e2b73c908f4512d9a925e736bd44fda Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 May 2021 13:26:56 +0300 Subject: CCtrlCombo::GetCurData = suitable helper for combo boxes --- protocols/CloudFile/src/options.cpp | 3 +- protocols/Gadu-Gadu/src/options.cpp | 11 ++----- protocols/ICQ-WIM/src/options.cpp | 4 +-- protocols/IRCG/src/options.cpp | 50 ++++++++++++++---------------- protocols/JabberG/src/jabber_chat.cpp | 8 ++--- protocols/JabberG/src/jabber_opt.cpp | 13 +++----- protocols/JabberG/src/jabber_privacy.cpp | 4 +-- protocols/SkypeWeb/src/skype_chatrooms.cpp | 2 +- protocols/VKontakte/src/vk_dialogs.cpp | 2 +- protocols/VKontakte/src/vk_options.cpp | 6 ++-- 10 files changed, 45 insertions(+), 58 deletions(-) (limited to 'protocols') diff --git a/protocols/CloudFile/src/options.cpp b/protocols/CloudFile/src/options.cpp index 0ac7c120a0..de961a314a 100644 --- a/protocols/CloudFile/src/options.cpp +++ b/protocols/CloudFile/src/options.cpp @@ -55,8 +55,7 @@ bool COptionsMainDlg::OnInitDialog() bool COptionsMainDlg::OnApply() { - int iItem = m_defaultService.GetCurSel(); - CCloudService *service = (CCloudService*)m_defaultService.GetItemData(iItem); + CCloudService *service = (CCloudService*)m_defaultService.GetCurData(); if (service) g_plugin.setString("DefaultService", service->GetAccountName()); else diff --git a/protocols/Gadu-Gadu/src/options.cpp b/protocols/Gadu-Gadu/src/options.cpp index ca3b411b79..2b2a3cc4c3 100644 --- a/protocols/Gadu-Gadu/src/options.cpp +++ b/protocols/Gadu-Gadu/src/options.cpp @@ -56,14 +56,9 @@ bool GaduOptionsDlgConference::OnInitDialog() bool GaduOptionsDlgConference::OnApply() { - int selectionIndex = cmbPolicyForAllChatParticipants.GetCurSel(); - m_proto->setWord(GG_KEY_GC_POLICY_TOTAL, cmbPolicyForAllChatParticipants.GetItemData(selectionIndex)); - - selectionIndex = cmbPolicyForUnknownChatParticipants.GetCurSel(); - m_proto->setWord(GG_KEY_GC_POLICY_UNKNOWN, cmbPolicyForUnknownChatParticipants.GetItemData(selectionIndex)); - - selectionIndex = cmbDefaultChatPolicy.GetCurSel(); - m_proto->setWord(GG_KEY_GC_POLICY_DEFAULT, cmbDefaultChatPolicy.GetItemData(selectionIndex)); + m_proto->setWord(GG_KEY_GC_POLICY_TOTAL, cmbPolicyForAllChatParticipants.GetCurData()); + m_proto->setWord(GG_KEY_GC_POLICY_UNKNOWN, cmbPolicyForUnknownChatParticipants.GetCurData()); + m_proto->setWord(GG_KEY_GC_POLICY_DEFAULT, cmbDefaultChatPolicy.GetCurData()); return true; } diff --git a/protocols/ICQ-WIM/src/options.cpp b/protocols/ICQ-WIM/src/options.cpp index 9272a5ef28..3191a92164 100644 --- a/protocols/ICQ-WIM/src/options.cpp +++ b/protocols/ICQ-WIM/src/options.cpp @@ -336,8 +336,8 @@ public: bool OnApply() override { if (cmbStatus1.GetHwnd()) { - m_proto->m_iStatus1 = cmbStatus1.GetItemData(cmbStatus1.GetCurSel()); - m_proto->m_iStatus2 = cmbStatus2.GetItemData(cmbStatus2.GetCurSel()); + m_proto->m_iStatus1 = cmbStatus1.GetCurData(); + m_proto->m_iStatus2 = cmbStatus2.GetCurData(); } return true; diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index a4af457627..dff900a683 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -704,8 +704,7 @@ public: m_proto->m_alias = m_alias.GetText(); m_quitMessage.GetText(m_proto->m_quitMessage, _countof(m_proto->m_quitMessage)); - int curSel = m_codepage.GetCurSel(); - m_proto->m_codepage = m_codepage.GetItemData(curSel); + m_proto->m_codepage = m_codepage.GetCurData(); if (m_proto->IsConnected()) m_proto->setCodepage(m_proto->m_codepage); @@ -746,11 +745,10 @@ public: void OnPerformCombo(CCtrlData *) { - int i = m_performCombo.GetCurSel(); - if (i == CB_ERR) + PERFORM_INFO *pPerf = (PERFORM_INFO *)m_performCombo.GetCurData(); + if (pPerf == INVALID_HANDLE_VALUE) return; - PERFORM_INFO *pPerf = (PERFORM_INFO *)m_performCombo.GetItemData(i); if (pPerf == nullptr) m_pertormEdit.SetTextA(""); else @@ -764,8 +762,7 @@ public: void OnCodePage(CCtrlData *) { - int curSel = m_codepage.GetCurSel(); - m_autodetect.Enable(m_codepage.GetItemData(curSel) != CP_UTF8); + m_autodetect.Enable(m_codepage.GetCurData() != CP_UTF8); } void OnPerformEdit(CCtrlData *) @@ -788,38 +785,37 @@ public: void OnAdd(CCtrlButton *) { - wchar_t *temp = m_pertormEdit.GetText(); + ptrW temp(m_pertormEdit.GetText()); if (my_strstri(temp, L"/away")) MessageBox(nullptr, TranslateT("The usage of /AWAY in your perform buffer is restricted\n as IRC sends this command automatically."), TranslateT("IRC Error"), MB_OK); else { - int i = m_performCombo.GetCurSel(); - if (i != CB_ERR) { - PERFORM_INFO *pPerf = (PERFORM_INFO *)m_performCombo.GetItemData(i); - if (pPerf != nullptr) - pPerf->mText = temp; + PERFORM_INFO *pPerf = (PERFORM_INFO *)m_performCombo.GetCurData(); + if (pPerf == INVALID_HANDLE_VALUE) + return; - m_add.Disable(); - m_performlistModified = true; - } + if (pPerf != nullptr) + pPerf->mText = temp; + + m_add.Disable(); + m_performlistModified = true; } - mir_free(temp); } void OnDelete(CCtrlButton *) { - int i = m_performCombo.GetCurSel(); - if (i != CB_ERR) { - PERFORM_INFO *pPerf = (PERFORM_INFO *)m_performCombo.GetItemData(i); - if (pPerf != nullptr) { - pPerf->mText = L""; - m_pertormEdit.SetTextA(""); - m_delete.Disable(); - m_add.Disable(); - } + PERFORM_INFO *pPerf = (PERFORM_INFO *)m_performCombo.GetCurData(); + if (pPerf == INVALID_HANDLE_VALUE) + return; - m_performlistModified = true; + if (pPerf != nullptr) { + pPerf->mText = L""; + m_pertormEdit.SetTextA(""); + m_delete.Disable(); + m_add.Disable(); } + + m_performlistModified = true; } }; diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 8946a65c78..8f1cbf7b50 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -865,13 +865,13 @@ public: void onSelChange_Affiliation(CCtrlCombo*) { - int value = cmbAffiliation.GetItemData(cmbAffiliation.GetCurSel()); + int value = cmbAffiliation.GetCurData(); btnAffiliation.Enable(m_him->m_affiliation != value); } void onClick_Affiliation(CCtrlButton *) { - int value = cmbAffiliation.GetItemData(cmbAffiliation.GetCurSel()); + int value = cmbAffiliation.GetCurData(); if (m_him->m_affiliation == value) return; @@ -907,13 +907,13 @@ public: void onSelChange_Role(CCtrlCombo *) { - int value = cmbRole.GetItemData(cmbRole.GetCurSel()); + int value = cmbRole.GetCurData(); btnRole.Enable(m_him->m_role != value); } void onClick_Role(CCtrlButton*) { - int value = cmbRole.GetItemData(cmbRole.GetCurSel()); + int value = cmbRole.GetCurData(); if (m_him->m_role == value) return; diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index ebc3eba2fd..fcd78fc404 100755 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -488,13 +488,10 @@ protected: else m_proto->delSetting("Password"); - int index = m_cbLocale.GetCurSel(); - if (index >= 0) { - char *szLanguageCode = (char*)m_cbLocale.GetItemData(index); - if (szLanguageCode) { - m_proto->setString("XmlLang", szLanguageCode); - replaceStr(m_proto->m_tszSelectedLang, szLanguageCode); - } + char *szLanguageCode = (char*)m_cbLocale.GetCurData(); + if (szLanguageCode && szLanguageCode != INVALID_HANDLE_VALUE) { + m_proto->setString("XmlLang", szLanguageCode); + replaceStr(m_proto->m_tszSelectedLang, szLanguageCode); } if (m_cbMam.Enabled() && m_cbMam.GetCurSel() != m_proto->m_iMamMode) @@ -1272,7 +1269,7 @@ private: void cbType_OnChange(CCtrlData *sender) { CCtrlCombo *chk = (CCtrlCombo *)sender; - setupConnection(chk->GetItemData(chk->GetCurSel())); + setupConnection(chk->GetCurData()); CheckRegistration(); } diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index a9f4888c88..a92d005d29 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -364,7 +364,7 @@ public: bool OnApply() override { - int nCurSel, nItemData = m_cbType.GetItemData(m_cbType.GetCurSel()); + int nCurSel, nItemData = m_cbType.GetCurData(); switch (nItemData) { case Jid: @@ -419,7 +419,7 @@ public: { if (!m_pRule) return; - switch (m_cbType.GetItemData(m_cbType.GetCurSel())) { + switch (m_cbType.GetCurData()) { case Jid: ShowWindow(GetDlgItem(m_hwnd, IDC_COMBO_VALUES), SW_SHOW); ShowWindow(GetDlgItem(m_hwnd, IDC_COMBO_VALUE), SW_HIDE); diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp index 64760e026f..779afbb63a 100644 --- a/protocols/SkypeWeb/src/skype_chatrooms.cpp +++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp @@ -99,7 +99,7 @@ public: bool OnApply() override { - m_hContact = m_combo.GetItemData(m_combo.GetCurSel()); + m_hContact = m_combo.GetCurData(); return true; } }; diff --git a/protocols/VKontakte/src/vk_dialogs.cpp b/protocols/VKontakte/src/vk_dialogs.cpp index d2e5c5b111..9668e3f2cd 100644 --- a/protocols/VKontakte/src/vk_dialogs.cpp +++ b/protocols/VKontakte/src/vk_dialogs.cpp @@ -162,7 +162,7 @@ bool CVkInviteChatForm::OnInitDialog() bool CVkInviteChatForm::OnApply() { - m_hContact = m_cbxCombo.GetItemData(m_cbxCombo.GetCurSel()); + m_hContact = m_cbxCombo.GetCurData(); return true; } diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp index 502cf17f84..898d7da17c 100644 --- a/protocols/VKontakte/src/vk_options.cpp +++ b/protocols/VKontakte/src/vk_options.cpp @@ -209,9 +209,9 @@ bool CVkOptionAccountForm::OnInitDialog() bool CVkOptionAccountForm::OnApply() { - m_proto->m_vkOptions.iSyncHistoryMetod = m_cbxSyncHistory.GetItemData(m_cbxSyncHistory.GetCurSel()); - m_proto->m_vkOptions.iMarkMessageReadOn = m_cbxMarkAsRead.GetItemData(m_cbxMarkAsRead.GetCurSel()); - m_proto->m_vkOptions.pwszVKLang = (wchar_t *)m_cbxVKLang.GetItemData(m_cbxVKLang.GetCurSel()); + m_proto->m_vkOptions.iSyncHistoryMetod = m_cbxSyncHistory.GetCurData(); + m_proto->m_vkOptions.iMarkMessageReadOn = m_cbxMarkAsRead.GetCurData(); + m_proto->m_vkOptions.pwszVKLang = (wchar_t *)m_cbxVKLang.GetCurData(); ptrW pwszGroupName(m_edtGroupName.GetText()); if (mir_wstrcmp(m_pwszOldGroup, pwszGroupName)) { -- cgit v1.2.3