CDlgBase::SetMinSize - a way to get rid of WM_GETMINMAXINFO in DlgProc

6 files changed, 13 insertions, 56 deletions

diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index b3d8e0e791..1f950169c9 100644
--- a/protocols/JabberG/src/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
@@ -176,6 +176,8 @@ public:
 		m_btnRemove(this, IDC_REMOVE, SKINICON_OTHER_DELETE, LPGEN("Remove")),

 		m_lvBookmarks(this, IDC_BM_LIST)

 	{

+		SetMinSize(451, 320);

+

 		m_lvBookmarks.OnItemActivate = Callback(this, &CJabberDlgBookmarks::lvBookmarks_OnDoubleClick);

 		m_btnAdd.OnClick = Callback(this, &CJabberDlgBookmarks::btnAdd_OnClick);

 		m_btnEdit.OnClick = Callback(this, &CJabberDlgBookmarks::btnEdit_OnClick);

@@ -235,14 +237,6 @@ public:
 	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override

 	{

 		switch (msg) {

-		case WM_GETMINMAXINFO:

-			{

-				LPMINMAXINFO lpmmi = (LPMINMAXINFO)lParam;

-				lpmmi->ptMinTrackSize.x = 451;

-				lpmmi->ptMinTrackSize.y = 320;

-				return 0;

-			}

-

 		case WM_COMMAND:

 			switch (LOWORD(wParam)) {

 			case IDOK:

diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp
index 6c1de0b61a..a4c2a4467c 100644
--- a/protocols/JabberG/src/jabber_console.cpp
+++ b/protocols/JabberG/src/jabber_console.cpp
@@ -315,7 +315,9 @@ class CJabberDlgConsole : public CJabberDlgBase
 public:

 	CJabberDlgConsole(CJabberProto *proto):

 		CJabberDlgBase(proto, IDD_CONSOLE)

-	{}

+	{

+		SetMinSize(300, 400);

+	}

 

 	bool OnInitDialog() override

 	{

@@ -437,14 +439,6 @@ public:
 	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override

 	{

 		switch (msg) {

-		case WM_GETMINMAXINFO:

-			{

-				LPMINMAXINFO lpmmi = (LPMINMAXINFO)lParam;

-				lpmmi->ptMinTrackSize.x = 300;

-				lpmmi->ptMinTrackSize.y = 400;

-				return 0;

-			}

-

 		case WM_COMMAND:

 			switch (LOWORD(wParam)) {

 			case IDOK:

diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index c299941589..baba3a7fce 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -506,6 +506,8 @@ public:
 		m_lstDiscoTree(this, IDC_TREE_DISCO), 

 		m_filter(this, IDC_FILTER)

 	{

+		SetMinSize(538, 374);

+

 		m_btnViewAsTree.OnClick = Callback(this, &CJabberDlgDiscovery::btnViewAsTree_OnClick);

 		m_btnViewAsList.OnClick = Callback(this, &CJabberDlgDiscovery::btnViewAsList_OnClick);

 		m_btnGoHome.OnClick = Callback(this, &CJabberDlgDiscovery::btnGoHome_OnClick);

@@ -819,14 +821,6 @@ public:
 			return result;

 

 		switch (msg) {

-		case WM_GETMINMAXINFO:

-			{

-				LPMINMAXINFO lpmmi = (LPMINMAXINFO)lParam;

-				lpmmi->ptMinTrackSize.x = 538;

-				lpmmi->ptMinTrackSize.y = 374;

-				return 0;

-			}

-

 		case WM_JABBER_TRANSPORT_REFRESH:

 			if (m_proto->m_nSDBrowseMode == SD_BROWSE_MYAGENTS) {

 				SetDlgItemText(m_hwnd, IDC_COMBO_JID, _T(SD_FAKEJID_MYAGENTS));

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 14508b7c92..5ffedcbbd1 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -1288,6 +1288,8 @@ public:
 		m_clcClist(this, IDC_CLIST),

 		m_edtNewJid(this, IDC_NEWJID)

 	{

+		SetMinSize(550, 390);

+

 		m_btnSimple.OnClick = Callback(this, &CJabberDlgPrivacyLists::btnSimple_OnClick);

 		m_btnAdvanced.OnClick = Callback(this, &CJabberDlgPrivacyLists::btnAdvanced_OnClick);

 		m_btnAddJid.OnClick = Callback(this, &CJabberDlgPrivacyLists::btnAddJid_OnClick);

@@ -1499,7 +1501,6 @@ public:
 	UI_MESSAGE_MAP(CJabberDlgPrivacyLists, CSuper);

 		UI_MESSAGE(WM_MEASUREITEM, OnWmMeasureItem);

 		UI_MESSAGE(WM_DRAWITEM, OnWmDrawItem);

-		UI_MESSAGE(WM_GETMINMAXINFO, OnWmGetMinMaxInfo);

 	UI_MESSAGE_MAP_END();

 

 	BOOL OnWmMeasureItem(UINT, WPARAM, LPARAM lParam)

@@ -1572,14 +1573,6 @@ public:
 		return TRUE;

 	}

 

-	BOOL OnWmGetMinMaxInfo(UINT, WPARAM, LPARAM lParam)

-	{

-		LPMINMAXINFO lpmmi = (LPMINMAXINFO)lParam;

-		lpmmi->ptMinTrackSize.x = 550;

-		lpmmi->ptMinTrackSize.y = 390;

-		return 0;

-	}

-

 	void btnSimple_OnClick(CCtrlButton*)

 	{

 		CheckDlgButton(m_hwnd, IDC_BTN_SIMPLE, BST_CHECKED);

diff --git a/protocols/JabberG/src/jabber_roster.cpp b/protocols/JabberG/src/jabber_roster.cpp
index c248722229..e0e8697ede 100644
--- a/protocols/JabberG/src/jabber_roster.cpp
+++ b/protocols/JabberG/src/jabber_roster.cpp
@@ -228,6 +228,8 @@ public:
 		btnUpload(this, IDC_UPLOAD),
 		btnDownload(this, IDC_DOWNLOAD)
 	{
+		SetMinSize(550, 390);
+
 		btnExport.OnClick = Callback(this, &CRosterEditorDlg::onClick_Export);
 		btnImport.OnClick = Callback(this, &CRosterEditorDlg::onClick_Import);
 		btnUpload.OnClick = Callback(this, &CRosterEditorDlg::onClick_Upload);
@@ -541,18 +543,6 @@ public:
 
 		OnChangeStatus();
 	}
-
-	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override
-	{
-		if (msg == WM_GETMINMAXINFO) {
-			LPMINMAXINFO lpmmi = (LPMINMAXINFO)lParam;
-			lpmmi->ptMinTrackSize.x = 550;
-			lpmmi->ptMinTrackSize.y = 390;
-			return 0;
-		}
-
-		return CSuper::DlgProc(msg, wParam, lParam);
-	}
 };
 
 INT_PTR __cdecl CJabberProto::OnMenuHandleRosterControl(WPARAM, LPARAM)
diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index af69115cf2..b48211d200 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -139,12 +139,10 @@ protected:
 	UI_MESSAGE_MAP(CJabberDlgPepSimple, CSuper);

 		UI_MESSAGE(WM_MEASUREITEM, OnWmMeasureItem);

 		UI_MESSAGE(WM_DRAWITEM, OnWmDrawItem);

-		UI_MESSAGE(WM_GETMINMAXINFO, OnWmGetMinMaxInfo);

 	UI_MESSAGE_MAP_END();

 

 	BOOL OnWmMeasureItem(UINT msg, WPARAM wParam, LPARAM lParam);

 	BOOL OnWmDrawItem(UINT msg, WPARAM wParam, LPARAM lParam);

-	BOOL OnWmGetMinMaxInfo(UINT msg, WPARAM wParam, LPARAM lParam);

 

 private:

 	struct CStatusMode

@@ -187,6 +185,8 @@ CJabberDlgPepSimple::CJabberDlgPepSimple(CJabberProto *proto, wchar_t *title) :
 	m_bOkClicked(false),

 	m_title(title)

 {

+	SetMinSize(200, 200);

+

 	m_btnOk.OnClick = Callback(this, &CJabberDlgPepSimple::btnOk_OnClick);

 	m_cbModes.OnChange = Callback(this, &CJabberDlgPepSimple::cbModes_OnChange);

 	m_cbModes.OnDropdown =

@@ -365,14 +365,6 @@ BOOL CJabberDlgPepSimple::OnWmDrawItem(UINT, WPARAM, LPARAM lParam)
 	return TRUE;

 }

 

-BOOL CJabberDlgPepSimple::OnWmGetMinMaxInfo(UINT, WPARAM, LPARAM lParam)

-{

-	LPMINMAXINFO lpmmi = (LPMINMAXINFO)lParam;

-	lpmmi->ptMinTrackSize.x = 200;

-	lpmmi->ptMinTrackSize.y = 200;

-	return 0;

-}

-

 ///////////////////////////////////////////////////////////////////////////////

 // CPepService base class