From fc86783e3a70b466e101c20f3d9fe6382bff6d09 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 24 Mar 2017 11:56:27 +0300 Subject: CCtrlBase::GetParent - missing const qualifier added --- include/m_gui.h | 2 +- libs/win32/mir_core.lib | Bin 313620 -> 313620 bytes libs/win64/mir_core.lib | Bin 314528 -> 314528 bytes src/mir_core/src/mir_core.def | 2 +- src/mir_core/src/mir_core64.def | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/m_gui.h b/include/m_gui.h index 270e6205bb..226260c324 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -495,7 +495,7 @@ public: __forceinline HWND GetHwnd() const { return m_hwnd; } __forceinline int GetCtrlId() const { return m_idCtrl; } - __forceinline CDlgBase *GetParent() { return m_parentWnd; } + __forceinline CDlgBase *GetParent() const { return m_parentWnd; } __forceinline bool IsChanged() const { return m_bChanged; } __forceinline void SetSilent() { m_bSilent = true; } __forceinline void UseSystemColors() { m_bUseSystemColors = true; } diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib index dfed0f6fc3..1d37de9d0a 100644 Binary files a/libs/win32/mir_core.lib and b/libs/win32/mir_core.lib differ diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib index 0861e6c4cf..2f42baaf97 100644 Binary files a/libs/win64/mir_core.lib and b/libs/win64/mir_core.lib differ diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index dc9ce30241..ae47e8ac8a 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -678,7 +678,7 @@ mir_wstrcmpi @280 ?GetNumberOfWorkAreas@CCtrlListView@@QAEHPAI@Z @843 NONAME ?GetOrigin@CCtrlListView@@QAEHPAUtagPOINT@@@Z @844 NONAME ?GetOutlineColor@CCtrlListView@@QAEKXZ @845 NONAME -?GetParent@CCtrlBase@@QAEPAVCDlgBase@@XZ @846 NONAME +?GetParent@CCtrlBase@@QBEPAVCDlgBase@@XZ @846 NONAME ?GetParent@CCtrlTreeView@@QAEPAU_TREEITEM@@PAU2@@Z @847 NONAME ?GetPrevSibling@CCtrlTreeView@@QAEPAU_TREEITEM@@PAU2@@Z @848 NONAME ?GetPrevVisible@CCtrlTreeView@@QAEPAU_TREEITEM@@PAU2@@Z @849 NONAME diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index ea7e8b69ee..24bbd1f59b 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -678,7 +678,7 @@ mir_wstrcmpi @280 ?GetNumberOfWorkAreas@CCtrlListView@@QEAAHPEAI@Z @843 NONAME ?GetOrigin@CCtrlListView@@QEAAHPEAUtagPOINT@@@Z @844 NONAME ?GetOutlineColor@CCtrlListView@@QEAAKXZ @845 NONAME -?GetParent@CCtrlBase@@QEAAPEAVCDlgBase@@XZ @846 NONAME +?GetParent@CCtrlBase@@QEBAPEAVCDlgBase@@XZ @846 NONAME ?GetParent@CCtrlTreeView@@QEAAPEAU_TREEITEM@@PEAU2@@Z @847 NONAME ?GetPrevSibling@CCtrlTreeView@@QEAAPEAU_TREEITEM@@PEAU2@@Z @848 NONAME ?GetPrevVisible@CCtrlTreeView@@QEAAPEAU_TREEITEM@@PEAU2@@Z @849 NONAME -- cgit v1.2.3