summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/m_gui.h5
-rw-r--r--libs/win32/mir_core.libbin318478 -> 319114 bytes
-rw-r--r--libs/win64/mir_core.libbin319436 -> 320084 bytes
-rw-r--r--src/mir_core/src/mir_core.def6
-rw-r--r--src/mir_core/src/mir_core64.def6
5 files changed, 11 insertions, 6 deletions
diff --git a/include/m_gui.h b/include/m_gui.h
index 27f91b99e7..e4c7c40ed3 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -406,6 +406,9 @@ public:
int DoModal();
void EndModal(INT_PTR nResult);
+ CCtrlBase* FindControl(int idCtrl);
+ CCtrlBase* FindControl(HWND hwnd);
+
void SetCaption(const wchar_t *ptszCaption);
void NotifyChange(void); // sends a notification to a parent window
@@ -463,8 +466,6 @@ private:
LIST<CCtrlBase> m_controls;
void NotifyControls(void (CCtrlBase::*fn)());
- CCtrlBase* FindControl(int idCtrl);
- CCtrlBase* FindControl(HWND hwnd);
CTimer* FindTimer(int idEvent);
diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib
index cb83c2c2b2..949cd6f9ac 100644
--- a/libs/win32/mir_core.lib
+++ b/libs/win32/mir_core.lib
Binary files differ
diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib
index 189b02e354..45b9cea779 100644
--- a/libs/win64/mir_core.lib
+++ b/libs/win64/mir_core.lib
Binary files differ
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 700a447198..d0fd2ed0c5 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -587,7 +587,6 @@ mir_wstrcmpi @280
?Expand@CCtrlClc@@QAEXPAXK@Z @752 NONAME
?Expand@CCtrlTreeView@@QAEXPAU_TREEITEM@@K@Z @753 NONAME
?FindContact@CCtrlClc@@QAEPAXI@Z @754 NONAME
-?FindControl@CDlgBase@@AAEPAVCCtrlBase@@H@Z @755 NONAME
?FindGroup@CCtrlClc@@QAEPAXH@Z @756 NONAME
?FindItem@CCtrlListView@@QAEHHPBUtagLVFINDINFOW@@@Z @757 NONAME
?FindNamedItem@CCtrlTreeView@@QAEPAU_TREEITEM@@PAU2@PB_W@Z @758 NONAME
@@ -1004,7 +1003,6 @@ CallFunctionSync @1170
?Stop@CTimer@@QAEXXZ @1189 NONAME
?AddTimer@CDlgBase@@IAEXPAVCTimer@@@Z @1190 NONAME
??0CCtrlBase@@AAE@PAUHWND__@@@Z @1191 NONAME
-?FindControl@CDlgBase@@AAEPAVCCtrlBase@@PAUHWND__@@@Z @1192 NONAME
?GetItemRect@CCtrlListBox@@QAEHHPAUtagRECT@@@Z @1193 NONAME
?SetItemHeight@CCtrlListBox@@QAEXHH@Z @1194 NONAME
?UseSystemColors@CCtrlBase@@QAEXXZ @1195 NONAME
@@ -1055,3 +1053,7 @@ HookTemporaryEvent @1241
??0CTimer@@QAE@$$QAV0@@Z @1243 NONAME
??4CTimer@@QAEAAV0@$$QAV0@@Z @1244 NONAME
IsTerminalDisconnected @1245
+?FindControl@CDlgBase@@QAEPAVCCtrlBase@@H@Z @1246 NONAME
+?FindControl@CDlgBase@@QAEPAVCCtrlBase@@PAUHWND__@@@Z @1247 NONAME
+?GlobalFieldEnum@CDlgBase@@CGHPAUHWND__@@J@Z @1248 NONAME
+?OnDestroy@CCtrlTreeView@@MAEXXZ @1249 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 6608c359c7..26daba4f81 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -587,7 +587,6 @@ mir_wstrcmpi @280
?Expand@CCtrlClc@@QEAAXPEAXK@Z @752 NONAME
?Expand@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@K@Z @753 NONAME
?FindContact@CCtrlClc@@QEAAPEAXI@Z @754 NONAME
-?FindControl@CDlgBase@@AEAAPEAVCCtrlBase@@H@Z @755 NONAME
?FindGroup@CCtrlClc@@QEAAPEAXH@Z @756 NONAME
?FindItem@CCtrlListView@@QEAAHHPEBUtagLVFINDINFOW@@@Z @757 NONAME
?FindNamedItem@CCtrlTreeView@@QEAAPEAU_TREEITEM@@PEAU2@PEB_W@Z @758 NONAME
@@ -1004,7 +1003,6 @@ CallFunctionSync @1170
?Stop@CTimer@@QEAAXXZ @1189 NONAME
?AddTimer@CDlgBase@@IEAAXPEAVCTimer@@@Z @1190 NONAME
??0CCtrlBase@@AEAA@PEAUHWND__@@@Z @1191 NONAME
-?FindControl@CDlgBase@@AEAAPEAVCCtrlBase@@PEAUHWND__@@@Z @1192 NONAME
?GetItemRect@CCtrlListBox@@QEAAHHPEAUtagRECT@@@Z @1193 NONAME
?SetItemHeight@CCtrlListBox@@QEAAXHH@Z @1194 NONAME
?UseSystemColors@CCtrlBase@@QEAAXXZ @1195 NONAME
@@ -1055,3 +1053,7 @@ HookTemporaryEvent @1241
??0CTimer@@QEAA@$$QEAV0@@Z @1243 NONAME
??4CTimer@@QEAAAEAV0@$$QEAV0@@Z @1244 NONAME
IsTerminalDisconnected @1245
+?FindControl@CDlgBase@@QEAAPEAVCCtrlBase@@H@Z @1246 NONAME
+?FindControl@CDlgBase@@QEAAPEAVCCtrlBase@@PEAUHWND__@@@Z @1247 NONAME
+?GlobalFieldEnum@CDlgBase@@CAHPEAUHWND__@@_J@Z @1248 NONAME
+?OnDestroy@CCtrlTreeView@@MEAAXXZ @1249 NONAME