diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-04-13 14:39:35 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-04-13 14:39:35 +0000 |
| commit | 2fa4d8fd0f2c29517025dfc3bebc8a5e07c3d380 (patch) | |
| tree | 2beeddcf0559b1c42c92ea6f32ef771b642285b8 /protocols/IRCG/src/windows.cpp | |
| parent | ec6783d12fa3d427acabed5460cf343255a77118 (diff) | |
- nasty crutch removed from Options_AddPage;
- HWND hwndParent removed from the CDlgBase constructor;
- method CDlgBase::SetParent() added for the rare occasions where it's needed;
git-svn-id: http://svn.miranda-ng.org/main/trunk@12785 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IRCG/src/windows.cpp')
| -rw-r--r-- | protocols/IRCG/src/windows.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp index a35a571855..dc6e686b3e 100644 --- a/protocols/IRCG/src/windows.cpp +++ b/protocols/IRCG/src/windows.cpp @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Message Box
CMessageBoxDlg::CMessageBoxDlg(CIrcProto *_pro, DCCINFO *_dci)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_MESSAGEBOX, NULL, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_MESSAGEBOX, false),
pdci(_dci),
m_Ok(this, IDOK)
{
@@ -251,7 +251,7 @@ void CNickDlg::OnOk(CCtrlButton*) #define LIST_TIMER 10
CListDlg::CListDlg(CIrcProto *_pro)
- : CProtoDlgBase<CIrcProto>(_pro, IDD_LIST, NULL, false),
+ : CProtoDlgBase<CIrcProto>(_pro, IDD_LIST, false),
m_Join(this, IDC_JOIN),
m_list(this, IDC_INFO_LISTVIEW),
m_list2(this, IDC_INFO_LISTVIEW2),
@@ -492,7 +492,7 @@ void CListDlg::UpdateList() // 'Join' dialog
CJoinDlg::CJoinDlg(CIrcProto *_pro)
- : CCoolIrcDlg(_pro, IDD_NICK, NULL),
+ : CCoolIrcDlg(_pro, IDD_NICK),
m_Ok(this, IDOK)
{
m_Ok.OnClick = Callback(this, &CJoinDlg::OnOk);
@@ -701,10 +701,12 @@ void CQuickDlg::OnServerCombo(CCtrlData*) // 'Question' dialog
CQuestionDlg::CQuestionDlg(CIrcProto *_pro, CManagerDlg *owner)
- : CCoolIrcDlg(_pro, IDD_QUESTION, (owner == NULL) ? NULL : owner->GetHwnd()),
+ : CCoolIrcDlg(_pro, IDD_QUESTION),
m_Ok(this, IDOK),
m_owner(owner)
{
+ if (owner != NULL)
+ m_hwndParent = owner->GetHwnd();
m_Ok.OnClick = Callback(this, &CQuestionDlg::OnOk);
}
@@ -1369,8 +1371,8 @@ void CManagerDlg::InitManager(int mode, const TCHAR* window) /////////////////////////////////////////////////////////////////////////////////////////
// 'cool' dialog
-CCoolIrcDlg::CCoolIrcDlg(CIrcProto* _pro, int dlgId, HWND parent)
- : CProtoDlgBase<CIrcProto>(_pro, dlgId, parent, false)
+CCoolIrcDlg::CCoolIrcDlg(CIrcProto* _pro, int dlgId)
+ : CProtoDlgBase<CIrcProto>(_pro, dlgId, false)
{}
void CCoolIrcDlg::OnInitDialog()
|