diff options
| author | George Hazan <ghazan@miranda.im> | 2019-09-03 22:59:13 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-09-03 22:59:13 +0300 |
| commit | 5d160367492834e0397808a12b8755ceb8cbed12 (patch) | |
| tree | aa858c8d270bc10cd0365fec2813d9b8bc637ae8 /src/mir_app | |
| parent | 6fbc81e2ceefe04b2ac05b2ecadd74ec7575090b (diff) | |
CChatRoomDlg globally renamed to CMsgDialog to be conpatible with StdMsg
Diffstat (limited to 'src/mir_app')
| -rw-r--r-- | src/mir_app/src/chat.h | 4 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_base.cpp | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/mir_app/src/chat.h b/src/mir_app/src/chat.h index f947c2c46b..8cc58a0d8b 100644 --- a/src/mir_app/src/chat.h +++ b/src/mir_app/src/chat.h @@ -28,9 +28,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void Srmm_CreateToolbarIcons(HWND hwndDlg, int flags);
void Srmm_ProcessToolbarHotkey(MCONTACT hContact, INT_PTR iButtonFrom, HWND hwndDlg);
-class CChatRoomDlg : public CSrmmBaseDialog
+class CMsgDialog : public CSrmmBaseDialog
{
- CChatRoomDlg(); // just to suppress compiler's warnings, never implemented
+ CMsgDialog(); // just to suppress compiler's warnings, never implemented
};
extern HGENMENU hJoinMenuItem, hLeaveMenuItem;
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index cff7201f24..8911b21e59 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -61,7 +61,7 @@ CSrmmBaseDialog::CSrmmBaseDialog(CMPluginBase &pPlugin, int idDialog, SESSION_IN m_btnHistory.OnClick = Callback(this, &CSrmmBaseDialog::onClick_History); m_btnChannelMgr.OnClick = Callback(this, &CSrmmBaseDialog::onClick_ChanMgr); - m_nickList.OnDblClick = Callback(this, &CChatRoomDlg::onDblClick_List); + m_nickList.OnDblClick = Callback(this, &CMsgDialog::onDblClick_List); if (si) { m_hContact = si->hContact; @@ -633,8 +633,10 @@ bool CSrmmBaseDialog::OnInitDialog() SetWindowLongPtr(m_message.GetHwnd(), GWLP_USERDATA, LPARAM(this)); mir_subclassWindow(m_message.GetHwnd(), stubMessageProc); - SetWindowLongPtr(m_nickList.GetHwnd(), GWLP_USERDATA, LPARAM(this)); - mir_subclassWindow(m_nickList.GetHwnd(), stubNicklistProc); + if (isChat()) { + 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); |