From 6bb048378e2b73c908f4512d9a925e736bd44fda Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 11 May 2021 13:26:56 +0300
Subject: CCtrlCombo::GetCurData = suitable helper for combo boxes

---
 protocols/JabberG/src/jabber_chat.cpp    |  8 ++++----
 protocols/JabberG/src/jabber_opt.cpp     | 13 +++++--------
 protocols/JabberG/src/jabber_privacy.cpp |  4 ++--
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'protocols/JabberG/src')

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);
-- 
cgit v1.2.3