summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin10/lib/mir_core.libbin313858 -> 314124 bytes
-rw-r--r--bin10/lib/mir_core64.libbin314896 -> 315168 bytes
-rw-r--r--bin12/lib/mir_core.libbin313858 -> 314124 bytes
-rw-r--r--bin12/lib/mir_core64.libbin314896 -> 315168 bytes
-rw-r--r--bin14/lib/mir_core.libbin313858 -> 314124 bytes
-rw-r--r--bin14/lib/mir_core64.libbin314896 -> 315168 bytes
-rw-r--r--include/m_gui.h1
-rw-r--r--src/mir_core/src/mir_core.def1
-rw-r--r--src/mir_core/src/mir_core64.def1
-rw-r--r--src/mir_core/src/ui_utils.cpp8
10 files changed, 9 insertions, 2 deletions
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib
index 238a5e57e8..7a5879ddbf 100644
--- a/bin10/lib/mir_core.lib
+++ b/bin10/lib/mir_core.lib
Binary files differ
diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib
index 6a457470e8..1d3da8e00d 100644
--- a/bin10/lib/mir_core64.lib
+++ b/bin10/lib/mir_core64.lib
Binary files differ
diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib
index 238a5e57e8..7a5879ddbf 100644
--- a/bin12/lib/mir_core.lib
+++ b/bin12/lib/mir_core.lib
Binary files differ
diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib
index 6a457470e8..1d3da8e00d 100644
--- a/bin12/lib/mir_core64.lib
+++ b/bin12/lib/mir_core64.lib
Binary files differ
diff --git a/bin14/lib/mir_core.lib b/bin14/lib/mir_core.lib
index 238a5e57e8..7a5879ddbf 100644
--- a/bin14/lib/mir_core.lib
+++ b/bin14/lib/mir_core.lib
Binary files differ
diff --git a/bin14/lib/mir_core64.lib b/bin14/lib/mir_core64.lib
index 6a457470e8..1d3da8e00d 100644
--- a/bin14/lib/mir_core64.lib
+++ b/bin14/lib/mir_core64.lib
Binary files differ
diff --git a/include/m_gui.h b/include/m_gui.h
index e020389051..d929d0ccd7 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -1198,6 +1198,7 @@ public:
void AddPage(wchar_t *ptszName, HICON hIcon, CDlgBase *pDlg);
void ActivatePage(int iPage);
+ int GetCount(void);
protected:
virtual BOOL OnNotify(int idCtrl, NMHDR *pnmh) override;
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 };