missing CSplitter initializer added

6 files changed, 21 insertions, 12 deletions

diff --git a/include/m_gui.h b/include/m_gui.h
index 88aa96ecd3..dfeabe7dd0 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -579,7 +579,7 @@ public:
 	void MakeFlat();

 	void MakePush();

 

-	virtual void OnInit();

+	virtual void OnInit() override;

 

 protected:

 	HICON m_hIcon;

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

 protected:

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

+	virtual void OnInit() override;

 

 	int m_iPosition;

 };

@@ -733,7 +734,7 @@ public:
 	void CreateDbLink(const char* szModuleName, const char* szSetting, wchar_t* szValue);

 	void CreateDbLink(CDataLink *link) { m_dbLink = link; }

 

-	virtual void OnInit();

+	virtual void OnInit() override;

 

 protected:

 	CDataLink *m_dbLink;

@@ -848,9 +849,9 @@ public:
 	CCtrlCombo(CDlgBase *dlg, int ctrlId);

 

 	virtual BOOL OnCommand(HWND /*hwndCtrl*/, WORD /*idCtrl*/, WORD idCode) override;

-	virtual void OnInit();

-	virtual void OnApply();

-	virtual void OnReset();

+	virtual void OnInit() override;

+	virtual void OnApply() override;

+	virtual void OnReset() override;

 

 	// Control interface

 	int    AddString(const wchar_t *text, LPARAM data = 0);

@@ -1192,10 +1193,10 @@ public:
 	CCallback<TEventInfo> OnSingleExpand;

 

 protected:

-	virtual void OnInit();

+	virtual void OnInit() override;

 	virtual BOOL OnNotify(int idCtrl, NMHDR *pnmh) override;

 	

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

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

 

 	union {

 		uint32_t m_dwFlags;

@@ -1239,13 +1240,13 @@ public:
 protected:

 	virtual BOOL OnNotify(int idCtrl, NMHDR *pnmh) override;

 	

-	virtual void OnInit();

-	virtual void OnDestroy();

+	virtual void OnInit() override;

+	virtual void OnDestroy() override;

 

-	virtual void OnApply();

-	virtual void OnReset();

+	virtual void OnApply() override;

+	virtual void OnReset() override;

 

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

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

 

 private:

 	HIMAGELIST m_hIml;

diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib
index cef06fbcd7..441c6f52ff 100644
--- a/libs/win32/mir_core.lib
+++ b/libs/win32/mir_core.lib
diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib
index 0c4b9f9b3a..3dc43e18c4 100644
--- a/libs/win64/mir_core.lib
+++ b/libs/win64/mir_core.lib
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 2d0e961b20..7456920715 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -1063,3 +1063,4 @@ CallFunctionSync @1170
 ??_7CSplitter@@6B@ @1220 NONAME

 ?CustomWndProc@CSplitter@@MAEJIIJ@Z @1221 NONAME

 ?GetPos@CSplitter@@QBEHXZ @1222 NONAME

+?OnInit@CSplitter@@MAEXXZ @1223 NONAME

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 985e595c74..ef5d3f229a 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -1063,3 +1063,4 @@ CallFunctionSync @1170
 ??_7CSplitter@@6B@ @1220 NONAME

 ?CustomWndProc@CSplitter@@MEAA_JI_K_J@Z @1221 NONAME

 ?GetPos@CSplitter@@QEBAHXZ @1222 NONAME

+?OnInit@CSplitter@@MEAAXXZ @1223 NONAME

diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp
index ade3c68e86..c5f69082d8 100644
--- a/src/mir_core/src/ui_utils.cpp
+++ b/src/mir_core/src/ui_utils.cpp
@@ -2579,6 +2579,12 @@ CSplitter::CSplitter(CDlgBase *wnd, int idCtrl)
 {

 }

 

+void CSplitter::OnInit()

+{

+	CSuper::OnInit();

+	Subclass();

+}

+

 LRESULT CSplitter::CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	RECT rc;