- unused member CDbLink::m_bSigned removed;

- obsolete CCtrlBase private members removed;

5 files changed, 2 insertions, 11 deletions

diff --git a/include/m_gui.h b/include/m_gui.h
index 28cc1dc958..a5d50beaa3 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -316,7 +316,6 @@ class MIR_CORE_EXPORT CDbLink : public CDataLink
 {

 	char *m_szModule;

 	char *m_szSetting;

-	bool m_bSigned;

 

 	DWORD m_iDefault;

 	wchar_t *m_szDefault;

@@ -504,10 +503,8 @@ class MIR_CORE_EXPORT CCtrlBase
 {

 	friend class CDlgBase;

 

-	__forceinline CCtrlBase(const CCtrlBase&) {}

-	__forceinline CCtrlBase& operator=(const CCtrlBase&) { return *this; }

-

-	__forceinline CCtrlBase(HWND hwnd) : m_hwnd(hwnd) {}

+	__forceinline CCtrlBase(const CCtrlBase&) = delete;

+	__forceinline CCtrlBase& operator=(const CCtrlBase&) = delete;

 

 public:

 	CCtrlBase(CDlgBase *wnd, int idCtrl);

diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib
index 4fc1bea98e..8bfa2ecc50 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 e92a0a1237..bb285eec3b 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 6039b67290..8ae1ef2f8d 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -457,9 +457,7 @@ mir_wstrcmpi                  @280
 ?c_str@?$CMSimpleStringT@D@@QBEPBDXZ @539 NONAME

 ?c_str@?$CMSimpleStringT@_W@@QBEPB_WXZ @540 NONAME

 ?EndModal@CDlgBase@@QAEXH@Z @541 NONAME

-??0CCtrlBase@@AAE@ABV0@@Z @609 NONAME

 ??0CCtrlBase@@QAE@PAVCDlgBase@@H@Z @610 NONAME

-??4CCtrlBase@@AAEAAV0@ABV0@@Z @611 NONAME

 ??0CCtrlButton@@QAE@PAVCDlgBase@@H@Z @612 NONAME

 ??0CCtrlCheck@@QAE@PAVCDlgBase@@H@Z @614 NONAME

 ??0CCtrlClc@@QAE@PAVCDlgBase@@H@Z @616 NONAME

@@ -979,7 +977,6 @@ CallFunctionSync @1170
 ?Start@CTimer@@QAEXH@Z @1188 NONAME

 ?Stop@CTimer@@QAEXXZ @1189 NONAME

 ?AddTimer@CDlgBase@@IAEXPAVCTimer@@@Z @1190 NONAME

-??0CCtrlBase@@AAE@PAUHWND__@@@Z @1191 NONAME

 ?GetItemRect@CCtrlListBox@@QAEHHPAUtagRECT@@@Z @1193 NONAME

 ?SetItemHeight@CCtrlListBox@@QAEXHH@Z @1194 NONAME

 ?UseSystemColors@CCtrlBase@@QAEXXZ @1195 NONAME

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 2d73dc7d91..2ffdb4d9e9 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -457,9 +457,7 @@ mir_wstrcmpi                  @280
 ?c_str@?$CMSimpleStringT@D@@QEBAPEBDXZ @539 NONAME

 ?c_str@?$CMSimpleStringT@_W@@QEBAPEB_WXZ @540 NONAME

 ?EndModal@CDlgBase@@QEAAX_J@Z @541 NONAME

-??0CCtrlBase@@AEAA@AEBV0@@Z @609 NONAME

 ??0CCtrlBase@@QEAA@PEAVCDlgBase@@H@Z @610 NONAME

-??4CCtrlBase@@AEAAAEAV0@AEBV0@@Z @611 NONAME

 ??0CCtrlButton@@QEAA@PEAVCDlgBase@@H@Z @612 NONAME

 ??0CCtrlCheck@@QEAA@PEAVCDlgBase@@H@Z @614 NONAME

 ??0CCtrlClc@@QEAA@PEAVCDlgBase@@H@Z @616 NONAME

@@ -979,7 +977,6 @@ CallFunctionSync @1170
 ?Start@CTimer@@QEAAXH@Z @1188 NONAME

 ?Stop@CTimer@@QEAAXXZ @1189 NONAME

 ?AddTimer@CDlgBase@@IEAAXPEAVCTimer@@@Z @1190 NONAME

-??0CCtrlBase@@AEAA@PEAUHWND__@@@Z @1191 NONAME

 ?GetItemRect@CCtrlListBox@@QEAAHHPEAUtagRECT@@@Z @1193 NONAME

 ?SetItemHeight@CCtrlListBox@@QEAAXHH@Z @1194 NONAME

 ?UseSystemColors@CCtrlBase@@QEAAXXZ @1195 NONAME