UI classes:

- CDlgBase::m_bSucceeded variable introduced to check whether IDOK was pressed or not;
- unused/useless buttons with id=IDOK or IDCANCEL removed;
- brnOk.OnClick replaced with OnApply calls;
- unused/useless calls of EndDialog/EndModal removed;
- minor code cleaning

3 files changed, 29 insertions, 47 deletions

diff --git a/protocols/VKontakte/src/vk_dialogs.cpp b/protocols/VKontakte/src/vk_dialogs.cpp
index bfd4dab273..9bdead7c7f 100644
--- a/protocols/VKontakte/src/vk_dialogs.cpp
+++ b/protocols/VKontakte/src/vk_dialogs.cpp
@@ -28,7 +28,6 @@ CVkCaptchaForm::CVkCaptchaForm(CVkProto *proto, CAPTCHA_FORM_PARAMS *param) :
 	m_param(param)

 {

 	m_btnOpenInBrowser.OnClick = Callback(this, &CVkCaptchaForm::On_btnOpenInBrowser_Click);

-	m_btnOk.OnClick = Callback(this, &CVkCaptchaForm::On_btnOk_Click);

 	m_edtValue.OnChange = Callback(this, &CVkCaptchaForm::On_edtValue_Change);

 }

 

@@ -42,6 +41,12 @@ bool CVkCaptchaForm::OnInitDialog()
 	return true;

 }

 

+bool CVkCaptchaForm::OnApply()

+{

+	m_edtValue.GetTextA(m_param->Result, _countof(m_param->Result));

+	return true;

+}

+

 INT_PTR CVkCaptchaForm::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg) {

@@ -90,12 +95,6 @@ void CVkCaptchaForm::On_btnOpenInBrowser_Click(CCtrlButton*)
 	m_proto->ShowCaptchaInBrowser(m_param->bmp);

 }

 

-void CVkCaptchaForm::On_btnOk_Click(CCtrlButton*)

-{

-	m_edtValue.GetTextA(m_param->Result, _countof(m_param->Result));

-	EndDialog(m_hwnd, 1);

-}

-

 void CVkCaptchaForm::On_edtValue_Change(CCtrlEdit*)

 {

 	m_btnOk.Enable(!IsEmpty(ptrA(m_edtValue.GetTextA())));

@@ -111,7 +110,6 @@ CVkWallPostForm::CVkWallPostForm(CVkProto *proto, WALLPOST_FORM_PARAMS *param) :
 	m_btnShare(this, IDOK),

 	m_param(param)

 {

-	m_btnShare.OnClick = Callback(this, &CVkWallPostForm::On_btnShare_Click);

 	m_edtMsg.OnChange = Callback(this, &CVkWallPostForm::On_edtValue_Change);

 	m_edtUrl.OnChange = Callback(this, &CVkWallPostForm::On_edtValue_Change);

 }

@@ -127,18 +125,17 @@ bool CVkWallPostForm::OnInitDialog()
 	return true;

 }

 

-void CVkWallPostForm::OnDestroy()

-{

-	Window_FreeIcon_IcoLib(m_hwnd);

-}

-

-void CVkWallPostForm::On_btnShare_Click(CCtrlButton*)

+bool CVkWallPostForm::OnApply()

 {

 	m_param->pwszUrl = m_edtUrl.GetText();

 	m_param->pwszMsg = m_edtMsg.GetText();

 	m_param->bFriendsOnly = m_cbOnlyForFriends.GetState() != 0;

+	return true;

+}

 

-	EndDialog(m_hwnd, 1);

+void CVkWallPostForm::OnDestroy()

+{

+	Window_FreeIcon_IcoLib(m_hwnd);

 }

 

 void CVkWallPostForm::On_edtValue_Change(CCtrlEdit*)

@@ -150,11 +147,9 @@ void CVkWallPostForm::On_edtValue_Change(CCtrlEdit*)
 

 CVkInviteChatForm::CVkInviteChatForm(CVkProto *proto) :

 	CVkDlgBase(proto, IDD_INVITE),

-	m_btnOk(this, IDOK),

 	m_cbxCombo(this, IDC_CONTACT),

 	m_hContact(0)

 {

-	m_btnOk.OnClick = Callback(this, &CVkInviteChatForm::btnOk_OnOk);

 }

 

 bool CVkInviteChatForm::OnInitDialog()

@@ -165,21 +160,19 @@ bool CVkInviteChatForm::OnInitDialog()
 	return true;

 }

 

-void CVkInviteChatForm::btnOk_OnOk(CCtrlButton*)

+bool CVkInviteChatForm::OnApply()

 {

 	m_hContact = m_cbxCombo.GetItemData(m_cbxCombo.GetCurSel());

-	EndDialog(m_hwnd, 1);

+	return true;

 }

 

 ////////////////////////////////// IDD_GC_CREATE //////////////////////////////////////////

 

 CVkGCCreateForm::CVkGCCreateForm(CVkProto *proto) :

 	CVkDlgBase(proto, IDD_GC_CREATE),

-	m_btnOk(this, IDOK),

 	m_clc(this, IDC_CLIST),

 	m_edtTitle(this, IDC_TITLE)

 {

-	m_btnOk.OnClick = Callback(this, &CVkGCCreateForm::btnOk_OnOk);

 	m_clc.OnListRebuilt = Callback(this, &CVkGCCreateForm::FilterList);

 }

 

@@ -193,7 +186,7 @@ bool CVkGCCreateForm::OnInitDialog()
 	return true;

 }

 

-void CVkGCCreateForm::btnOk_OnOk(CCtrlButton*)

+bool CVkGCCreateForm::OnApply()

 {

 	CMStringA szUIds;

 	for (auto &hContact : m_proto->AccContacts()) {

@@ -214,8 +207,7 @@ void CVkGCCreateForm::btnOk_OnOk(CCtrlButton*)
 	bool bRes = !szUIds.IsEmpty();

 	if (bRes)

 		m_proto->CreateNewChat(szUIds, ptrW(m_edtTitle.GetText()));

-

-	EndDialog(m_hwnd, bRes);

+	return true;

 }

 

 void CVkGCCreateForm::FilterList(CCtrlClc*)

@@ -239,13 +231,11 @@ void CVkGCCreateForm::ResetListOptions()
 

 CVkContactDeleteForm::CVkContactDeleteForm(CVkProto *proto, CONTACTDELETE_FORM_PARAMS *param) :

 	CVkDlgBase(proto, IDD_CONTACTDELETE),

-	m_btnOk(this, IDOK),

 	m_stText(this, IDC_STATIC_TXT),

 	m_cbDeleteFromFriendlist(this, IDC_CH_REMOVE_FROM_FRIEND),

 	m_cbDeleteDialog(this, IDC_CH_CLEARHISTORY),

 	m_param(param)

 {

-	m_btnOk.OnClick = Callback(this, &CVkContactDeleteForm::btnOk_OnOk);

 }

 

 bool CVkContactDeleteForm::OnInitDialog()

@@ -269,12 +259,9 @@ bool CVkContactDeleteForm::OnInitDialog()
 	return true;

 }

 

-void CVkContactDeleteForm::btnOk_OnOk(CCtrlButton*)

+bool CVkContactDeleteForm::OnApply()

 {

-

 	m_param->bDeleteDialog = m_cbDeleteDialog.GetState() != 0;

-	m_param->bDeleteFromFriendlist = m_param->bEnableDeleteFromFriendlist

-		&& (m_cbDeleteFromFriendlist.GetState() != 0);

-

-	EndDialog(m_hwnd, 1);

-}
\ No newline at end of file
+	m_param->bDeleteFromFriendlist = m_param->bEnableDeleteFromFriendlist && (m_cbDeleteFromFriendlist.GetState() != 0);

+	return true;

+}

diff --git a/protocols/VKontakte/src/vk_dialogs.h b/protocols/VKontakte/src/vk_dialogs.h
index 903e26679a..bf62571015 100644
--- a/protocols/VKontakte/src/vk_dialogs.h
+++ b/protocols/VKontakte/src/vk_dialogs.h
@@ -41,12 +41,12 @@ public:
 	CVkCaptchaForm(CVkProto *proto, CAPTCHA_FORM_PARAMS *param);

 

 	bool OnInitDialog() override;

+	bool OnApply() override;

 	void OnDestroy() override;

 

 	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override;

 	

 	void On_btnOpenInBrowser_Click(CCtrlButton*);

-	void On_btnOk_Click(CCtrlButton*);

 	void On_edtValue_Change(CCtrlEdit*);

 

 };

@@ -88,9 +88,9 @@ public:
 	CVkWallPostForm(CVkProto *proto, WALLPOST_FORM_PARAMS *param);

 

 	bool OnInitDialog() override;

-	void OnDestroy();

+	bool OnApply() override;

+	void OnDestroy() override;

 

-	void On_btnShare_Click(CCtrlButton*);

 	void On_edtValue_Change(CCtrlEdit*);

 };

 

@@ -98,7 +98,6 @@ public:
 

 class CVkInviteChatForm : public CVkDlgBase

 {

-	CCtrlButton m_btnOk;

 	CCtrlCombo m_cbxCombo;

 

 public:

@@ -107,23 +106,21 @@ public:
 	CVkInviteChatForm(CVkProto *proto);

 

 	bool OnInitDialog() override;

-

-	void btnOk_OnOk(CCtrlButton*);

+	bool OnApply() override;

 };

 

 ////////////////////////////////// IDD_GC_CREATE //////////////////////////////////////////

 

 class CVkGCCreateForm : public CVkDlgBase

 {

-	CCtrlButton m_btnOk;

 	CCtrlClc m_clc;

 	CCtrlEdit m_edtTitle;

 

 public:

 	CVkGCCreateForm(CVkProto *proto);

 	bool OnInitDialog() override;

-	

-	void btnOk_OnOk(CCtrlButton*);

+	bool OnApply() override;

+

 	void FilterList(CCtrlClc*);

 	void ResetListOptions();

 };

@@ -152,13 +149,11 @@ class CVkContactDeleteForm : public CVkDlgBase
 	CCtrlBase m_stText;

 	CCtrlCheck m_cbDeleteFromFriendlist;

 	CCtrlCheck m_cbDeleteDialog;

-	CCtrlButton m_btnOk;

 

 	CONTACTDELETE_FORM_PARAMS *m_param;

 

 public:

 	CVkContactDeleteForm(CVkProto *proto, CONTACTDELETE_FORM_PARAMS *param);

 	bool OnInitDialog() override;

-	

-	void btnOk_OnOk(CCtrlButton*);

-};
\ No newline at end of file
+	bool OnApply() override;

+};

diff --git a/protocols/VKontakte/src/vk_struct.cpp b/protocols/VKontakte/src/vk_struct.cpp
index 90f3e7cba5..efec941c19 100644
--- a/protocols/VKontakte/src/vk_struct.cpp
+++ b/protocols/VKontakte/src/vk_struct.cpp
@@ -353,7 +353,7 @@ void CVkUserItem::LoadFromGroup(const JSONNode & jnNode)
 	Set(m_wszDomain, jnNode["screen_name"].as_mstring());

 }

 

-MCONTACT CVkUserItem::WriteToDB(bool bForce, VKContactType vkContactType)

+MCONTACT CVkUserItem::WriteToDB(bool bForce, VKContactType /*vkContactType*/)

 {

 	if (!bForce && !m_bIsUpdated)

 		return m_hContact;