From 47a8f51fb9830ac470c40dfce3ce27c09fd82d7b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 14 Dec 2016 16:53:37 +0300 Subject: new method - CCtrlPages::GetCount() --- src/mir_core/src/mir_core.def | 1 + src/mir_core/src/mir_core64.def | 1 + src/mir_core/src/ui_utils.cpp | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 6647e17126..2020ff8fec 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -1039,3 +1039,4 @@ CallFunctionSync @1170 ?SetPosition@CCtrlSpin@@QAEXG@Z @1196 NONAME ?GetPosition@CCtrlSpin@@QAEGXZ @1197 NONAME ?OnNotify@CCtrlSpin@@EAEHHPAUtagNMHDR@@@Z @1198 NONAME +?GetCount@CCtrlPages@@QAEHXZ @1199 NONAME diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 80f401f367..c5be964fd0 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -1039,3 +1039,4 @@ CallFunctionSync @1170 ?SetPosition@CCtrlSpin@@QEAAXG@Z @1196 NONAME ?GetPosition@CCtrlSpin@@QEAAGXZ @1197 NONAME ?OnNotify@CCtrlSpin@@EEAAHHPEAUtagNMHDR@@@Z @1198 NONAME +?GetCount@CCtrlPages@@QEAAHXZ @1199 NONAME diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp index e4719b7372..ef6291a8cf 100644 --- a/src/mir_core/src/ui_utils.cpp +++ b/src/mir_core/src/ui_utils.cpp @@ -2268,8 +2268,6 @@ void CCtrlPages::OnInit() LRESULT CCtrlPages::CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) { - PSHNOTIFY pshn; - switch (msg) { case WM_SIZE: RECT rc; @@ -2289,6 +2287,7 @@ LRESULT CCtrlPages::CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) return TRUE; case PSM_FORCECHANGED: + PSHNOTIFY pshn; pshn.hdr.code = PSN_INFOCHANGED; pshn.hdr.idFrom = 0; pshn.lParam = 0; @@ -2327,6 +2326,11 @@ void CCtrlPages::ActivatePage(int iPage) TabCtrl_SetCurSel(m_hwnd, info->m_pageId); } +int CCtrlPages::GetCount() +{ + return m_pages.getCount(); +} + CCtrlPages::TPageInfo* CCtrlPages::GetCurrPage() { TCITEM tci = { 0 }; -- cgit v1.2.3