more UI classes related code cleaning

4 files changed, 26 insertions, 41 deletions

diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp
index 203ee9669d..a334e3f58b 100644
--- a/plugins/MenuItemEx/src/options.cpp
+++ b/plugins/MenuItemEx/src/options.cpp
@@ -30,16 +30,6 @@ class COptDialog : public CDlgBase
 		m_chkSMName, m_chkCopyID, m_chkCopyIDName, m_chkShowID, m_chkTrimID, m_chkIgnoreHide;

 	CCtrlLabel m_lblHint;

 

-	void EnableWindowChecks()

-	{

-		m_chkAlpha.Enable(m_chkVis.GetState());

-		m_chkIgnoreHide.Enable(m_chkIgnore.GetState());

-		m_chkCopyIDName.Enable(m_chkCopyID.GetState());

-		m_chkShowID.Enable(m_chkCopyID.GetState());

-		m_chkTrimID.Enable(m_chkCopyID.GetState() && m_chkShowID.GetState());

-		m_chkSMName.Enable(m_chkStatusMsg.GetState());

-	}

-

 public:

 	COptDialog() :

 		CDlgBase(g_plugin, IDD_OPTIONS),

@@ -62,11 +52,10 @@ public:
 	{

 		m_flags = g_plugin.getDword("flags", vf_default);

 

-		m_chkVis.OnChange = Callback(this, &COptDialog::OnVisChange);

-		m_chkIgnore.OnChange = Callback(this, &COptDialog::OnIgnoreChange);

-		m_chkCopyID.OnChange = Callback(this, &COptDialog::OnCopyIDChange);

-		m_chkStatusMsg.OnChange = Callback(this, &COptDialog::OnStatusMsgChange);

-		m_chkShowID.OnChange = Callback(this, &COptDialog::OnShowIDChange);

+		m_chkVis.OnChange = Callback(this, &COptDialog::onChange_Vis);

+		m_chkIgnore.OnChange = Callback(this, &COptDialog::onChange_Ignore);

+		m_chkStatusMsg.OnChange = Callback(this, &COptDialog::onChange_StatusMsg);

+		m_chkCopyID.OnChange = m_chkShowID.OnChange = Callback(this, &COptDialog::onChange_CopyID);

 	}

 

 	bool OnInitDialog() override

@@ -82,8 +71,6 @@ public:
 			buffer.Format(L"%s *", item.GetText());

 			item.SetText(buffer);

 		}

-

-		EnableWindowChecks();

 		return true;

 	}

 

@@ -100,29 +87,26 @@ public:
 		return true;

 	}

 

-	void OnVisChange(CCtrlBase*)

+	void onChange_Vis(CCtrlBase*)

 	{

-		EnableWindowChecks();

-	}

-

-	void OnIgnoreChange(CCtrlBase*)

-	{

-		EnableWindowChecks();

+		m_chkAlpha.Enable(m_chkVis.GetState());

 	}

 

-	void OnCopyIDChange(CCtrlBase*)

+	void onChange_Ignore(CCtrlBase*)

 	{

-		EnableWindowChecks();

+		m_chkIgnoreHide.Enable(m_chkIgnore.GetState());

 	}

 

-	void OnStatusMsgChange(CCtrlBase*)

+	void onChange_CopyID(CCtrlBase*)

 	{

-		EnableWindowChecks();

+		m_chkCopyIDName.Enable(m_chkCopyID.GetState());

+		m_chkShowID.Enable(m_chkCopyID.GetState());

+		m_chkTrimID.Enable(m_chkCopyID.GetState() && m_chkShowID.GetState());

 	}

 

-	void OnShowIDChange(CCtrlBase*)

+	void onChange_StatusMsg(CCtrlBase*)

 	{

-		EnableWindowChecks();

+		m_chkSMName.Enable(m_chkStatusMsg.GetState());

 	}

 };

 

diff --git a/plugins/MirLua/src/options.cpp b/plugins/MirLua/src/options.cpp
index e196c52f3c..3a5ddc012d 100644
--- a/plugins/MirLua/src/options.cpp
+++ b/plugins/MirLua/src/options.cpp
@@ -207,8 +207,7 @@ void CMLuaEvaluateOptions::OnAutoEvalChange(CCtrlBase*)
 		m_script.OnChange = Callback(this, &CMLuaEvaluateOptions::OnEvaluate);

 		m_evaluate.Click();

 	}

-	else

-		m_script.OnChange = CCallback<CCtrlBase>();

+	else m_script.OnChange = CCallback<CCtrlBase>();

 }

 

 void CMLuaEvaluateOptions::OnEvaluate(CCtrlBase*)

diff --git a/plugins/MyDetails/src/options.cpp b/plugins/MyDetails/src/options.cpp
index d500e586ff..31e4617665 100644
--- a/plugins/MyDetails/src/options.cpp
+++ b/plugins/MyDetails/src/options.cpp
@@ -170,7 +170,7 @@ public:
 

 	void OnAvatarRoundChange(CCtrlBase*)

 	{

-		BOOL enabled = m_chkAvatarRound.IsChecked();

+		bool enabled = m_chkAvatarRound.IsChecked();

 		m_chkAvatarCustomCorn.Enable(enabled);

 		enabled = enabled && m_chkAvatarCustomCorn.IsChecked();

 		m_edtAvatarCustomCorn.Enable(enabled);

@@ -179,7 +179,7 @@ public:
 

 	void OnAvatarCustomCornChange(CCtrlBase*)

 	{

-		BOOL enabled = m_chkAvatarRound.IsChecked();

+		bool enabled = m_chkAvatarRound.IsChecked();

 		m_chkAvatarCustomCorn.Enable(enabled);

 		enabled = enabled && m_chkAvatarCustomCorn.IsChecked();

 		m_edtAvatarCustomCorn.Enable(enabled);

@@ -188,36 +188,37 @@ public:
 

 	void OnShowProtoNameChange(CCtrlBase*)

 	{

-		BOOL enabled = m_chkShowProtoName.IsChecked();

+		bool enabled = m_chkShowProtoName.IsChecked();

 		m_chkShowCycleProtoBtn.Enable(enabled);

 	}

 

 	void OnAvatarCustomSizeChange(CCtrlBase*)

 	{

-		BOOL enabled = m_chkAvatarCustomSize.IsChecked();

+		bool enabled = m_chkAvatarCustomSize.IsChecked();

 		m_edtAvatarCustomSize.Enable(enabled);

 		m_spnAvatarCustomSize.Enable(enabled);

 	}

 

 	void OnCycleProtosChange(CCtrlBase*)

 	{

-		BOOL enabled = m_chkCycleProtos.IsChecked();

+		bool enabled = m_chkCycleProtos.IsChecked();

 		m_edtCycleTime.Enable(enabled);

 		m_spnCycleTime.Enable(enabled);

 	}

 

 	void OnReplaceSmiliesChange(CCtrlBase*)

 	{

-		BOOL enabled = m_chkReplaceSmilies.IsChecked();

+		bool enabled = m_chkReplaceSmilies.IsChecked();

 		m_chkUseCLSmilies.Enable(enabled);

 		m_chkResizeSmilies.Enable(enabled);

 	}

 

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

 	{

-		BOOL ret = SaveOptsDlgProc(pageControls, _countof(pageControls), MODULENAME, m_hwnd, msg, wParam, lParam);

+		INT_PTR ret = SaveOptsDlgProc(pageControls, _countof(pageControls), MODULENAME, m_hwnd, msg, wParam, lParam);

 		if (ret)

 			return ret;

+		

 		return CDlgBase::DlgProc(msg, wParam, lParam);

 	}

 };

diff --git a/plugins/NewStory/src/history.cpp b/plugins/NewStory/src/history.cpp
index f7ca4cc22f..194669c545 100644
--- a/plugins/NewStory/src/history.cpp
+++ b/plugins/NewStory/src/history.cpp
@@ -836,8 +836,9 @@ public:
 
 	void onChange_SearchText(CCtrlEdit*)
 	{
-		if (showFlags & HIST_AUTO_FILTER)
-			PostMessage(m_hwnd, UM_REBUILDLIST, 0, 0);
+		if (m_bInitialized)
+			if (showFlags & HIST_AUTO_FILTER)
+				PostMessage(m_hwnd, UM_REBUILDLIST, 0, 0);
 	}
 
 	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override