diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 5 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_base.cpp | 7 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_log_hpp.cpp | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 492af0aede..11bdbd1978 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -573,11 +573,10 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam) m_btnChannelMgr.Enable(m_si->pMI->bChanMgr);
}
}
- else {
- SetupStatusBar();
- }
+ else SetupStatusBar();
CSuper::DlgProc(uMsg, wParam, lParam); // call built-in resizer
+ m_pLog->Resize();
SetButtonsPos();
}
return TRUE;
diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index abf909314a..92015295b7 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -486,12 +486,11 @@ bool CSrmmBaseDialog::OnInitDialog() SetWindowLongPtr(m_hwnd, GWLP_USERDATA, (LONG_PTR)this);
m_pLog = Srmm_GetLogWindow((CMsgDialog*)this);
+ m_pLog->Attach();
if (m_pLog->GetType() != 0) { // custom log type
- HWND hwndLog = GetDlgItem(m_hwnd, IDC_SRMM_LOG);
- EnableWindow(hwndLog, FALSE);
- ShowWindow(hwndLog, SW_HIDE);
+ DestroyWindow(GetDlgItem(m_hwnd, IDC_SRMM_LOG));
+ SetWindowLong(m_pLog->GetHwnd(), GWLP_ID, IDC_SRMM_LOG);
}
- m_pLog->Attach();
SetWindowLongPtr(m_message.GetHwnd(), GWLP_USERDATA, LPARAM(this));
mir_subclassWindow(m_message.GetHwnd(), stubMessageProc);
diff --git a/src/mir_app/src/srmm_log_hpp.cpp b/src/mir_app/src/srmm_log_hpp.cpp index 969200d093..9a70d495a7 100644 --- a/src/mir_app/src/srmm_log_hpp.cpp +++ b/src/mir_app/src/srmm_log_hpp.cpp @@ -198,7 +198,7 @@ public: IEVIEWWINDOW ieWindow = { sizeof(ieWindow) };
ieWindow.iType = IEW_SETPOS;
- ieWindow.parent = m_hwnd;
+ ieWindow.parent = m_pDlg.GetHwnd();
ieWindow.hwnd = m_hwnd;
ieWindow.x = pt.x;
ieWindow.y = pt.y;
|