more effective way to use OnChange callbacks automatically

4 files changed, 21 insertions, 5 deletions

diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc
index 97a45e8480..d7cc7e427b 100644
--- a/src/core/stdmsg/res/resource.rc
+++ b/src/core/stdmsg/res/resource.rc
@@ -43,8 +43,8 @@ BEGIN
     CONTROL         "Use the contact's status icon as the window icon",IDC_STATUSWIN,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,75,290,10

     CONTROL         "Save the window size and location individually for each contact",IDC_SAVEPERCONTACT,

-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,88,289,10

-    CONTROL         "Cascade new windows",IDC_CASCADE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,100,289,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,88,289,10

+    CONTROL         "Cascade new windows",IDC_CASCADE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,100,289,10

     CONTROL         "Support Ctrl+Up/Down in message area to show previously sent messages",IDC_CTRLSUPPORT,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,112,289,10

     CONTROL         "Delete temporary contacts when closing message window",IDC_DELTEMP,

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index d5d27dea9d..49aeb6873b 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -211,8 +211,10 @@ public:
 		tree.SetFlags(MTREE_CHECKBOX);

 

 		chkAvatar.OnChange = Callback(this, &COptionMainDlg::onChange_Avatar);

+		chkAutoMin.OnChange = Callback(this, &COptionMainDlg::onChange_AutoMin);

 		chkAutoClose.OnChange = Callback(this, &COptionMainDlg::onChange_AutoClose);

 		chkLimitAvatar.OnChange = Callback(this, &COptionMainDlg::onChange_LimitAvatar);

+		chkSavePerContact.OnChange = Callback(this, &COptionMainDlg::onChange_SavePerContact);

 

 		CreateLink(edtNFlash, g_dat.nFlashMax);

 		CreateLink(edtAvatarH, g_dat.iAvatarHeight);

@@ -261,9 +263,21 @@ public:
 		return true;

 	}

 

-	void onChange_AutoClose(CCtrlCheck *pCheck)

+	void onChange_AutoMin(CCtrlCheck*)

 	{

-		chkCtrlSupport.Enable(!pCheck->GetState());

+		chkAutoClose.SetState(false);

+		chkCtrlSupport.Enable(!chkAutoClose.GetState());

+	}

+

+	void onChange_AutoClose(CCtrlCheck*)

+	{

+		chkAutoMin.SetState(false);

+		chkCtrlSupport.Enable(!chkAutoClose.GetState());

+	}

+

+	void onChange_SavePerContact(CCtrlCheck*)

+	{

+		chkCascade.Enable(!chkSavePerContact.GetState());

 	}

 

 	void onChange_Avatar(CCtrlCheck*)

diff --git a/src/mir_core/src/CCtrlCheck.cpp b/src/mir_core/src/CCtrlCheck.cpp
index 7d26af32fd..a20a1a9275 100644
--- a/src/mir_core/src/CCtrlCheck.cpp
+++ b/src/mir_core/src/CCtrlCheck.cpp
@@ -58,7 +58,6 @@ int CCtrlCheck::GetState()
 void CCtrlCheck::SetState(int state)
 {
 	::SendMessage(m_hwnd, BM_SETCHECK, state, 0);
-	OnChange(this);
 }
 
 bool CCtrlCheck::IsChecked()
diff --git a/src/mir_core/src/CDlgBase.cpp b/src/mir_core/src/CDlgBase.cpp
index 7c079cc258..dcfe15b292 100644
--- a/src/mir_core/src/CDlgBase.cpp
+++ b/src/mir_core/src/CDlgBase.cpp
@@ -218,6 +218,9 @@ INT_PTR CDlgBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 		if (!OnInitDialog())
 			return FALSE;
 
+		for (auto &it : m_controls)
+			it->OnChange(it);
+
 		m_bInitialized = true;
 		return TRUE;