diff options
| author | George Hazan <ghazan@miranda.im> | 2017-03-09 14:30:35 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-03-09 14:30:45 +0300 |
| commit | 6bf18e4265c8a0938d12e98eef1562b1ee4bc97b (patch) | |
| tree | c5d317dc655ef1327ebcf463f3508da1f32b93b0 /src | |
| parent | 58e977eada0eb95198dbc552d99446c83506a73a (diff) | |
any CSrmmBaseDialog descendant can refer to SESSION_INFO, not only CChatRoomDlg
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/src/chat_window.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/stdafx.h | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_base.cpp | 1 |
5 files changed, 4 insertions, 3 deletions
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp index 8af9e7db0c..b66912c87d 100644 --- a/src/core/stdmsg/src/chat_window.cpp +++ b/src/core/stdmsg/src/chat_window.cpp @@ -827,7 +827,6 @@ static void __cdecl phase2(void * lParam) CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si) : CSrmmBaseDialog(g_hInst, g_Settings.bTabsEnable ? IDD_CHANNEL_TAB : IDD_CHANNEL), - m_si(si), m_nickList(this, IDC_LIST), m_message(this, IDC_MESSAGE), m_log(this, IDC_LOG), @@ -849,6 +848,7 @@ CChatRoomDlg::CChatRoomDlg(SESSION_INFO *si) : m_splitterX(this, IDC_SPLITTERX), m_splitterY(this, IDC_SPLITTERY) { + m_si = si; m_pLog = &m_log; m_pEntry = &m_message; m_hContact = si->hContact; diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h index 9fe02becd0..076d743dad 100644 --- a/src/core/stdmsg/src/stdafx.h +++ b/src/core/stdmsg/src/stdafx.h @@ -177,8 +177,6 @@ class CChatRoomDlg : public CSrmmBaseDialog HWND m_hwndStatus;
- SESSION_INFO *m_si;
-
CCtrlEdit m_message, m_log;
CCtrlListBox m_nickList;
CCtrlButton m_btnOk;
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 1c3331b386..58a81567f4 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -407,3 +407,4 @@ ProtoGetAvatarMimeType @401 ?DlgProc@CSrmmBaseDialog@@MAEHIIJ@Z @408 NONAME
??2CSrmmBaseDialog@@SAPAXI@Z @409 NONAME
??3CSrmmBaseDialog@@SAXPAX@Z @410 NONAME
+?isChat@CSrmmBaseDialog@@QBE_NXZ @411 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 7d21ef797f..4616073840 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -407,3 +407,4 @@ ProtoGetAvatarMimeType @401 ?DlgProc@CSrmmBaseDialog@@MEAA_JI_K_J@Z @408 NONAME
??2CSrmmBaseDialog@@SAPEAX_K@Z @409 NONAME
??3CSrmmBaseDialog@@SAXPEAX@Z @410 NONAME
+?isChat@CSrmmBaseDialog@@QEBA_NXZ @411 NONAME
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index 5968514838..65f6c65d3c 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -27,6 +27,7 @@ extern HCURSOR g_hCurHyperlinkHand; CSrmmBaseDialog::CSrmmBaseDialog(HINSTANCE hInst, int idDialog) : CDlgBase(hInst, idDialog), + m_si(nullptr), m_pLog(nullptr), m_pEntry(nullptr), m_hContact(0) |