5 files changed, 24 insertions, 8 deletions
diff --git a/src/core/stdidle/src/options.cpp b/src/core/stdidle/src/options.cpp
index 4b9beab7ac..71b8c14f27 100644
--- a/src/core/stdidle/src/options.cpp
+++ b/src/core/stdidle/src/options.cpp
@@ -35,7 +35,7 @@ int IdleGetStatusIndex(WORD status)
 	return 0;
 }
 
-class COptionsDlg : public CPluginDlgBase
+class COptionsDlg : public CDlgBase
 {
 	CCtrlEdit edt1sttime;
 	CCtrlSpin spinIdle;
@@ -57,7 +57,7 @@ class COptionsDlg : public CPluginDlgBase
 
 public:
 	COptionsDlg() :
-		CPluginDlgBase(g_plugin, IDD_OPT_IDLE, MODULENAME),
+		CDlgBase(g_plugin, IDD_OPT_IDLE),
 		edt1sttime(this, IDC_IDLE1STTIME),
 		spinIdle(this, IDC_IDLESPIN),
 		cmbAAStatus(this, IDC_AASTATUS),
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index c7aee9c376..99f034c6fa 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -150,7 +150,7 @@ statusValues[] =
 	{ PF2_ONTHEPHONE, LPGENW("On the phone") }
 };
 
-class COptionMainDlg : public CPluginDlgBase
+class COptionMainDlg : public CDlgBase
 {
 	CCtrlEdit  edtNFlash, edtAvatarH, edtSecs;
 	CCtrlCheck chkAutoMin, chkAutoClose, chkSavePerContact, chkDoNotStealFocus;
@@ -193,7 +193,7 @@ class COptionMainDlg : public CPluginDlgBase
 
 public:
 	COptionMainDlg() :
-		CPluginDlgBase(g_plugin, IDD_OPT_MSGDLG, SRMMMOD),
+		CDlgBase(g_plugin, IDD_OPT_MSGDLG),
 		tree(this, IDC_POPLIST),
 		edtSecs(this, IDC_SECONDS),
 		edtNFlash(this, IDC_NFLASHES),
@@ -305,7 +305,7 @@ public:
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-class COptionLogDlg : public CPluginDlgBase
+class COptionLogDlg : public CDlgBase
 {
 	HBRUSH hBkgColourBrush;
 
@@ -315,7 +315,7 @@ class COptionLogDlg : public CPluginDlgBase
 
 public:
 	COptionLogDlg() :
-		CPluginDlgBase(g_plugin, IDD_OPT_MSGLOG, SRMMMOD),
+		CDlgBase(g_plugin, IDD_OPT_MSGLOG),
 		chkSecs(this, IDC_SHOWSECS),
 		chkDate(this, IDC_SHOWDATES),
 		chkTime(this, IDC_SHOWTIMES),
@@ -409,7 +409,7 @@ public:
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-class COptionTypingDlg : public CPluginDlgBase
+class COptionTypingDlg : public CDlgBase
 {
 	HANDLE hItemNew, hItemUnknown;
 
@@ -418,7 +418,7 @@ class COptionTypingDlg : public CPluginDlgBase
 
 public:
 	COptionTypingDlg() :
-		CPluginDlgBase(g_plugin, IDD_OPT_MSGTYPE, SRMMMOD),
+		CDlgBase(g_plugin, IDD_OPT_MSGTYPE),
 		clist(this, IDC_CLIST),
 		chkType(this, IDC_SHOWNOTIFY),
 		chkTypeWin(this, IDC_TYPEWIN),
diff --git a/src/mir_core/src/CDlgBase.cpp b/src/mir_core/src/CDlgBase.cpp
index ab21be6a15..bc8b7af72f 100644
--- a/src/mir_core/src/CDlgBase.cpp
+++ b/src/mir_core/src/CDlgBase.cpp
@@ -113,6 +113,18 @@ void CDlgBase::Show(int nCmdShow)
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
+
+void CDlgBase::CreateLink(CCtrlData& ctrl, const char *szSetting, BYTE type, DWORD iValue)
+{
+	ctrl.CreateDbLink(m_pPlugin.getModule(), szSetting, type, iValue);
+}
+
+void CDlgBase::CreateLink(CCtrlData& ctrl, const char *szSetting, wchar_t *szValue)
+{
+	ctrl.CreateDbLink(m_pPlugin.getModule(), szSetting, szValue);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
 // virtual methods
 
 int CDlgBase::Resizer(UTILRESIZECONTROL*)
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index eecbb7c04d..4bb5b14e91 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -1065,3 +1065,5 @@ IsTerminalDisconnected @1245
 CallObjectEventHook @1259
 ?db_get_sm@@YG?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@IPBD0@Z @1260 NONAME
 ?db_get_wsm@@YG?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@IPBD0@Z @1261 NONAME
+?CreateLink@CDlgBase@@IAEXAAVCCtrlData@@PBDEK@Z @1262 NONAME
+?CreateLink@CDlgBase@@IAEXAAVCCtrlData@@PBDPA_W@Z @1263 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index c0ebe31ddb..638caf74fb 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -1065,3 +1065,5 @@ IsTerminalDisconnected @1245
 CallObjectEventHook @1259
 ?db_get_sm@@YA?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@IPEBD0@Z @1260 NONAME
 ?db_get_wsm@@YA?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@IPEBD0@Z @1261 NONAME
+?CreateLink@CDlgBase@@IEAAXAEAVCCtrlData@@PEBDEK@Z @1262 NONAME
+?CreateLink@CDlgBase@@IEAAXAEAVCCtrlData@@PEBDPEA_W@Z @1263 NONAME