From 11b8719d106635799800b09e203628d0c7ff2f4c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 19 May 2015 13:10:00 +0000 Subject: control comparator function removed from the class definition git-svn-id: http://svn.miranda-ng.org/main/trunk@13694 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/lib/mir_core.lib | Bin 333380 -> 333118 bytes bin10/lib/mir_core64.lib | Bin 335266 -> 335000 bytes bin12/lib/mir_core.lib | Bin 333380 -> 333118 bytes bin12/lib/mir_core64.lib | Bin 335266 -> 335000 bytes include/m_gui.h | 7 ------- src/mir_core/src/mir_core.def | 1 - src/mir_core/src/mir_core64.def | 1 - src/mir_core/src/ui_utils.cpp | 6 +++++- 8 files changed, 5 insertions(+), 10 deletions(-) diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib index 79f1dde7d1..8f8ecaada2 100644 Binary files a/bin10/lib/mir_core.lib and b/bin10/lib/mir_core.lib differ diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib index d1cfb15264..6aaa60f2e6 100644 Binary files a/bin10/lib/mir_core64.lib and b/bin10/lib/mir_core64.lib differ diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib index 19f99c3631..8f8ecaada2 100644 Binary files a/bin12/lib/mir_core.lib and b/bin12/lib/mir_core.lib differ diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib index a69d7c77e1..6aaa60f2e6 100644 Binary files a/bin12/lib/mir_core64.lib and b/bin12/lib/mir_core64.lib differ diff --git a/include/m_gui.h b/include/m_gui.h index 718c388cbc..51d2d3ddd0 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -373,13 +373,6 @@ public: virtual void OnApply(); virtual void OnReset(); - static int cmp(const CCtrlBase *c1, const CCtrlBase *c2) - { - if (c1->m_idCtrl < c2->m_idCtrl) return -1; - if (c1->m_idCtrl > c2->m_idCtrl) return +1; - return 0; - } - protected: HWND m_hwnd; // must be the first data item int m_idCtrl; diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 489473cc41..f42a795ad6 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -1066,7 +1066,6 @@ mir_wstrcmpi @280 ?UpdateStatusBar@CProtoIntDlgBase@@AAEXXZ @1067 NONAME ?WindowSubscribe@PROTO_INTERFACE@@QAEXPAUHWND__@@@Z @1068 NONAME ?WindowUnsubscribe@PROTO_INTERFACE@@QAEXPAUHWND__@@@Z @1069 NONAME -?cmp@CCtrlBase@@SAHPBV1@0@Z @1070 NONAME ProtoWindowAdd @1071 NONAME ProtoWindowRemove @1072 NONAME Proto_IsProtocolLoaded @1073 NONAME diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index cd8e726c37..b2adec82c1 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -1066,7 +1066,6 @@ mir_wstrcmpi @280 ?UpdateStatusBar@CProtoIntDlgBase@@AEAAXXZ @1067 NONAME ?WindowSubscribe@PROTO_INTERFACE@@QEAAXPEAUHWND__@@@Z @1068 NONAME ?WindowUnsubscribe@PROTO_INTERFACE@@QEAAXPEAUHWND__@@@Z @1069 NONAME -?cmp@CCtrlBase@@SAHPEBV1@0@Z @1070 NONAME ProtoWindowAdd @1071 NONAME ProtoWindowRemove @1072 NONAME Proto_IsProtocolLoaded @1073 NONAME diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp index 3249499003..deb0ed00ed 100644 --- a/src/mir_core/src/ui_utils.cpp +++ b/src/mir_core/src/ui_utils.cpp @@ -41,8 +41,12 @@ static LIST arControls(10, CompareControls); #pragma comment(lib, "uxtheme") +static int CompareControlId(const CCtrlBase *c1, const CCtrlBase *c2) +{ return c1->GetCtrlId() - c2->GetCtrlId(); +} + CDlgBase::CDlgBase(HINSTANCE hInst, int idDialog) - : m_controls(1, CCtrlBase::cmp) + : m_controls(1, CompareControlId) { m_hInst = hInst; m_idDialog = idDialog; -- cgit v1.2.3