merge from master till

fixes #1408 (StdMsg: window caption bug)

1 files changed, 15 insertions, 14 deletions

diff --git a/include/m_gui.h b/include/m_gui.h
index e7679a56b3..75b6a13642 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -1307,6 +1307,19 @@ class MIR_CORE_EXPORT CCtrlPages : public CCtrlBase
 {

 	typedef CCtrlBase CSuper;

 

+	HIMAGELIST m_hIml;

+	CDlgBase *m_pActivePage;

+	int m_numRows = 1;

+

+	struct TPageInfo;

+	void InsertPage(TPageInfo *pPage);

+	void ShowPage(CDlgBase *pDlg);

+

+	void CheckRowCount();

+	TPageInfo* GetCurrPage();

+	TPageInfo* GetItemPage(int iPage);

+	LIST<TPageInfo> m_pages;

+

 public:

 	CCtrlPages(CDlgBase *dlg, int ctrlId);

 

@@ -1314,10 +1327,11 @@ public:
 	void ActivatePage(int iPage);

 	int  GetCount(void);

 	int  GetDlgIndex(CDlgBase*);

-	CDlgBase* GetNthPage(int iPage);

 	void RemovePage(int iPage);

 	void SwapPages(int idx1, int idx2);

 

+	CDlgBase* GetNthPage(int iPage);

+

 	__forceinline CDlgBase* GetActivePage() const

 	{	return m_pActivePage;

 	}

@@ -1332,19 +1346,6 @@ protected:
 	void OnReset() override;

 

 	LRESULT CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) override;

-

-private:

-	HIMAGELIST m_hIml;

-	CDlgBase *m_pActivePage;

-

-	struct TPageInfo;

-

-	void InsertPage(TPageInfo *pPage);

-	void ShowPage(CDlgBase *pDlg);

-

-	TPageInfo* GetCurrPage();

-	TPageInfo* GetItemPage(int iPage);

-	LIST<TPageInfo> m_pages;

 };

 

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