From 428051b8b98331a7419ca025be55a1ce0c52f826 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 2 Dec 2016 15:41:52 +0300 Subject: CCtrlSpin::GetPosition() - new method of spin control --- bin10/lib/mir_core.lib | Bin 313254 -> 313530 bytes bin10/lib/mir_core64.lib | Bin 314278 -> 314560 bytes bin12/lib/mir_core.lib | Bin 313254 -> 313530 bytes bin12/lib/mir_core64.lib | Bin 314278 -> 314560 bytes bin14/lib/mir_core.lib | Bin 313254 -> 313530 bytes bin14/lib/mir_core64.lib | Bin 314278 -> 314560 bytes include/m_gui.h | 1 + src/mir_core/src/mir_core.def | 1 + src/mir_core/src/mir_core64.def | 1 + src/mir_core/src/ui_utils.cpp | 5 +++++ 10 files changed, 8 insertions(+) diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib index 443580479c..40a38f9015 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 29589f1c2d..2f3d1ccb59 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 443580479c..40a38f9015 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 29589f1c2d..2f3d1ccb59 100644 Binary files a/bin12/lib/mir_core64.lib and b/bin12/lib/mir_core64.lib differ diff --git a/bin14/lib/mir_core.lib b/bin14/lib/mir_core.lib index 443580479c..40a38f9015 100644 Binary files a/bin14/lib/mir_core.lib and b/bin14/lib/mir_core.lib differ diff --git a/bin14/lib/mir_core64.lib b/bin14/lib/mir_core64.lib index 29589f1c2d..2f3d1ccb59 100644 Binary files a/bin14/lib/mir_core64.lib and b/bin14/lib/mir_core64.lib differ diff --git a/include/m_gui.h b/include/m_gui.h index 322994b895..24d09ff14c 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -762,6 +762,7 @@ class MIR_CORE_EXPORT CCtrlSpin : public CCtrlBase public: CCtrlSpin(CDlgBase *dlg, int ctrlId); + WORD GetPosition(); void SetPosition(WORD max, WORD min = 0); void SetRange(WORD max, WORD min = 0); }; diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index c1f420f5cc..ab1a87b9c7 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -1037,3 +1037,4 @@ CallFunctionSync @1170 ?SetItemHeight@CCtrlListBox@@QAEXHH@Z @1194 NONAME ?UseSystemColors@CCtrlBase@@QAEXXZ @1195 NONAME ?SetPosition@CCtrlSpin@@QAEXGG@Z @1196 NONAME +?GetPosition@CCtrlSpin@@QAEGXZ @1197 NONAME diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index c7d937c248..2f448e51a0 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -1037,3 +1037,4 @@ CallFunctionSync @1170 ?SetItemHeight@CCtrlListBox@@QEAAXHH@Z @1194 NONAME ?UseSystemColors@CCtrlBase@@QEAAXXZ @1195 NONAME ?SetPosition@CCtrlSpin@@QEAAXGG@Z @1196 NONAME +?GetPosition@CCtrlSpin@@QEAAGXZ @1197 NONAME diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp index 00917d9a8f..a1ff5a9597 100644 --- a/src/mir_core/src/ui_utils.cpp +++ b/src/mir_core/src/ui_utils.cpp @@ -676,6 +676,11 @@ CCtrlSpin::CCtrlSpin(CDlgBase *dlg, int ctrlId) : CCtrlBase(dlg, ctrlId) {} +WORD CCtrlSpin::GetPosition() +{ + return SendMsg(UDM_GETPOS, 0, 0); +} + void CCtrlSpin::SetPosition(WORD wMax, WORD wMin) { SendMsg(UDM_SETPOS, 0, MAKELONG(wMin, wMax)); -- cgit v1.2.3