summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-05-07 17:11:10 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-05-07 17:11:10 +0000
commit4322e60a76440683afc694c1df0f2ccc8de726c3 (patch)
tree615f1bee3471f7f3f4f78305dfdecf2f043ff1be
parentaa6b13e2545e7b8dbab49bc14909443643e375e9 (diff)
missing method CDlgBase::SetCaption() for setting window's title
git-svn-id: http://svn.miranda-ng.org/main/trunk@13476 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--bin10/lib/mir_core.libbin327802 -> 328088 bytes
-rw-r--r--bin10/lib/mir_core64.libbin329532 -> 329828 bytes
-rw-r--r--bin12/lib/mir_core.libbin327802 -> 328088 bytes
-rw-r--r--bin12/lib/mir_core64.libbin329532 -> 329828 bytes
-rw-r--r--include/m_gui.h2
-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.cpp6
8 files changed, 10 insertions, 0 deletions
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib
index e0579bd66a..c12ea2873b 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 80bc55baf0..cd28e984f6 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 4f6f25252d..b63a576fa3 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 80bc55baf0..55ba27672c 100644
--- a/bin12/lib/mir_core64.lib
+++ b/bin12/lib/mir_core64.lib
Binary files differ
diff --git a/include/m_gui.h b/include/m_gui.h
index 3e3d783fb1..9bacf454af 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -267,6 +267,8 @@ public:
void Show(int nCmdShow = SW_SHOW);
int DoModal();
+ void SetCaption(const TCHAR *ptszCaption);
+
__forceinline HINSTANCE GetInst() const { return m_hInst; }
__forceinline HWND GetHwnd() const { return m_hwnd; }
__forceinline bool IsInitialized() const { return m_initialized; }
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 464ba16984..afc34ebc8a 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -1075,3 +1075,4 @@ Proto_IsProtocolLoaded @1073 NONAME
Proto_RegisterModule @1074 NONAME
?GetInst@CDlgBase@@QBEPAUHINSTANCE__@@XZ @1075 NONAME
?Find@CDlgBase@@SAPAV1@PAUHWND__@@@Z @1076 NONAME
+?SetCaption@CDlgBase@@QAEXPB_W@Z @1077 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 8ded9a75f0..6b2071dfc8 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -1076,3 +1076,4 @@ Proto_RegisterModule @1074 NONAME
?GetInst@CDlgBase@@QEBAPEAUHINSTANCE__@@XZ @1075 NONAME
?Find@CDlgBase@@SAPEAV1@PEAUHWND__@@@Z @1076 NONAME
+?SetCaption@CDlgBase@@QEAAXPEB_W@Z @1077 NONAME
diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp
index 1148ab247a..e4fad58f64 100644
--- a/src/mir_core/src/ui_utils.cpp
+++ b/src/mir_core/src/ui_utils.cpp
@@ -77,6 +77,12 @@ int CDlgBase::DoModal()
return DialogBoxParam(m_hInst, MAKEINTRESOURCE(m_idDialog), m_hwndParent, GlobalDlgProc, (LPARAM)this);
}
+void CDlgBase::SetCaption(const TCHAR *ptszCaption)
+{
+ if (m_hwnd && ptszCaption)
+ SetWindowText(m_hwnd, ptszCaption);
+}
+
int CDlgBase::Resizer(UTILRESIZECONTROL*)
{
return RD_ANCHORX_LEFT|RD_ANCHORY_TOP;