more common code incapsulated into mir_app.dll

13 files changed, 6 insertions, 17 deletions

diff --git a/include/m_message.h b/include/m_message.h
index 23f4482b5c..1173e822ca 100644
--- a/include/m_message.h
+++ b/include/m_message.h
@@ -259,10 +259,6 @@ EXTERN_C MIR_APP_DLL(int) Srmm_SetButtonState(MCONTACT hContact, BBButton *bbdi)
 // returns 0 on success and nonzero value otherwise

 EXTERN_C MIR_APP_DLL(void) Srmm_ResetToolbar();

 

-// creates toolbar buttons for a SRMM window

-// flags might be either BBBF_ISIMBUTTON or BBBF_ISCHATBUTTON, depending on a window type

-EXTERN_C MIR_APP_DLL(void) Srmm_CreateToolbarIcons(HWND hwndDlg, int flags);

-

 // updates all toolbar icons in a message dialog

 EXTERN_C MIR_APP_DLL(void) Srmm_UpdateToolbarIcons(HWND hdlg);

 

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 47990811ac..620cbdc1a1 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 466b663668..35f4a93ea1 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Scriver/src/chat_window.cpp b/plugins/Scriver/src/chat_window.cpp
index 107c87db54..551abc982b 100644
--- a/plugins/Scriver/src/chat_window.cpp
+++ b/plugins/Scriver/src/chat_window.cpp
@@ -216,8 +216,6 @@ void CChatRoomDlg::OnInitDialog()
 

 	m_pParent = (ParentWindowData *)GetWindowLongPtr(m_hwndParent, GWLP_USERDATA);

 

-	Srmm_CreateToolbarIcons(m_hwnd, BBBF_ISCHATBUTTON);

-

 	RECT rc;

 	GetWindowRect(m_message.GetHwnd(), &rc);

 	m_minLogBoxHeight = m_minEditBoxHeight = rc.bottom - rc.top;

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 9fd00e3ed0..b270d3fac1 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -273,7 +273,6 @@ void CSrmmWindow::OnInitDialog()
 		PostMessage(m_message.GetHwnd(), EM_SETSEL, len, len);

 	}

 

-	Srmm_CreateToolbarIcons(m_hwnd, BBBF_ISIMBUTTON);

 	SendMessage(m_hwnd, DM_CHANGEICONS, 0, 0);

 

 	m_log.SendMsg(EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS | ENM_LINK | ENM_KEYEVENTS);

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index 742accd73e..07e9b64814 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -153,8 +153,6 @@ void CTabBaseDlg::BB_InitDlgButtons()
 
 	m_bbLSideWidth = m_bbRSideWidth = 0;
 
-	Srmm_CreateToolbarIcons(m_hwnd, isChat() ? BBBF_ISCHATBUTTON : BBBF_ISIMBUTTON);
-
 	CustomButtonData *cbd;
 	for (int i = 0; cbd = Srmm_GetNthButton(i); i++) {
 		HWND hwndButton = GetDlgItem(m_hwnd, cbd->m_dwButtonCID);
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp
index 7eee70faef..adee9649c9 100644
--- a/src/core/stdmsg/src/chat_window.cpp
+++ b/src/core/stdmsg/src/chat_window.cpp
@@ -63,9 +63,6 @@ void CChatRoomDlg::OnInitDialog()
 	else
 		onActivate();
 
-	// initialize toolbar icons
-	Srmm_CreateToolbarIcons(m_hwnd, BBBF_ISCHATBUTTON);
-
 	m_log.SendMsg(EM_AUTOURLDETECT, 1, 0);
 
 	int mask = (int)m_log.SendMsg(EM_GETEVENTMASK, 0, 0);
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 152b5dfa16..d66a15cc00 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -156,8 +156,6 @@ void CSrmmWindow::OnInitDialog()
 	if (m_splitterPos == -1)

 		m_splitterPos = m_originalSplitterPos;

 

-	Srmm_CreateToolbarIcons(m_hwnd, BBBF_ISIMBUTTON);

-

 	GetWindowRect(m_message.GetHwnd(), &m_minEditInit);

 	SendMessage(m_hwnd, DM_UPDATESIZEBAR, 0, 0);

 

diff --git a/src/mir_app/src/chat.h b/src/mir_app/src/chat.h
index cfc262e3eb..7fff02b700 100644
--- a/src/mir_app/src/chat.h
+++ b/src/mir_app/src/chat.h
@@ -23,6 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_popup.h>

 #include <m_fontservice.h>

 

+void Srmm_CreateToolbarIcons(HWND hwndDlg, int flags);

+

 struct MODULEINFO : public GCModuleInfoBase {};

 struct SESSION_INFO : public GCSessionInfoBase {};

 struct LOGSTREAMDATA : public GCLogStreamDataBase {};

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 68dbedb446..21ee8846f5 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -343,7 +343,6 @@ Miranda_OkToExit @344
 Miranda_GetVersion @345

 Miranda_GetFileVersion @346

 Miranda_GetVersionText @347

-Srmm_CreateToolbarIcons @348

 Netlib_CloseHandle @349

 Netlib_Recv @350

 Netlib_Send @351

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 5e8ad0beb4..1db051a51d 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -343,7 +343,6 @@ Miranda_OkToExit @344
 Miranda_GetVersion @345

 Miranda_GetFileVersion @346

 Miranda_GetVersionText @347

-Srmm_CreateToolbarIcons @348

 Netlib_CloseHandle @349

 Netlib_Recv @350

 Netlib_Send @351

diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp
index 55f43a5362..91040e3ecb 100644
--- a/src/mir_app/src/srmm_base.cpp
+++ b/src/mir_app/src/srmm_base.cpp
@@ -590,6 +590,9 @@ void CSrmmBaseDialog::OnInitDialog()
 	SetWindowLongPtr(m_nickList.GetHwnd(), GWLP_USERDATA, LPARAM(this));
 	mir_subclassWindow(m_nickList.GetHwnd(), stubNicklistProc);
 
+	// three buttons below are initiated inside this call, so button creation must precede subclassing
+	Srmm_CreateToolbarIcons(m_hwnd, isChat() ? BBBF_ISCHATBUTTON : BBBF_ISIMBUTTON);
+
 	mir_subclassWindow(m_btnFilter.GetHwnd(), Srmm_ButtonSubclassProc);
 	mir_subclassWindow(m_btnColor.GetHwnd(), Srmm_ButtonSubclassProc);
 	mir_subclassWindow(m_btnBkColor.GetHwnd(), Srmm_ButtonSubclassProc);
diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp
index 1469628d70..96ea229d53 100644
--- a/src/mir_app/src/srmm_toolbar.cpp
+++ b/src/mir_app/src/srmm_toolbar.cpp
@@ -317,7 +317,7 @@ MIR_APP_DLL(void) Srmm_ResetToolbar()
 	dwSepCount = 0;
 }
 
-MIR_APP_DLL(void) Srmm_CreateToolbarIcons(HWND hwndDlg, int flags)
+void Srmm_CreateToolbarIcons(HWND hwndDlg, int flags)
 {
 	HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hwndDlg, GWLP_HINSTANCE);