X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c641b1d20d5c6dae5663070f45fe11a871565df0..4a46a5df879c4f820d0a0a435b34c7d5e4793991:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index b6519a0f95..1bf777979b 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: msw/frame.cpp -// Purpose: wxFrameMSW +// Purpose: wxFrame // Author: Julian Smart // Modified by: // Created: 01/02/97 @@ -73,14 +73,12 @@ extern wxMenu *wxCurrentPopupMenu; // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxFrameMSW, wxFrameBase) - EVT_ACTIVATE(wxFrameMSW::OnActivate) - EVT_SYS_COLOUR_CHANGED(wxFrameMSW::OnSysColourChanged) +BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) + EVT_ACTIVATE(wxFrame::OnActivate) + EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() -#ifndef __WXUNIVERSAL__ - IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) // ============================================================================ // implementation @@ -92,9 +90,9 @@ END_EVENT_TABLE() #if wxUSE_STATUSBAR #if wxUSE_NATIVE_STATUSBAR - bool wxFrameMSW::m_useNativeStatusBar = TRUE; + bool wxFrame::m_useNativeStatusBar = TRUE; #else - bool wxFrameMSW::m_useNativeStatusBar = FALSE; + bool wxFrame::m_useNativeStatusBar = FALSE; #endif #endif // wxUSE_NATIVE_STATUSBAR @@ -102,7 +100,7 @@ END_EVENT_TABLE() // creation/destruction // ---------------------------------------------------------------------------- -void wxFrameMSW::Init() +void wxFrame::Init() { #if wxUSE_TOOLTIPS m_hwndToolTip = 0; @@ -114,10 +112,12 @@ void wxFrameMSW::Init() m_fsToolBarHeight = 0; // m_fsMenu = 0; + m_wasMinimized = FALSE; + m_winLastFocused = (wxWindow *)NULL; } -bool wxFrameMSW::Create(wxWindow *parent, +bool wxFrame::Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos, @@ -128,46 +128,25 @@ bool wxFrameMSW::Create(wxWindow *parent, if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) return FALSE; - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); wxModelessWindows.Append(this); return TRUE; } -wxFrameMSW::~wxFrameMSW() +wxFrame::~wxFrame() { m_isBeingDeleted = TRUE; DeleteAllBars(); } -// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. -void wxFrameMSW::DoGetClientSize(int *x, int *y) const -{ - RECT rect; - ::GetClientRect(GetHwnd(), &rect); - -#if wxUSE_STATUSBAR - if ( GetStatusBar() && GetStatusBar()->IsShown() ) - { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - rect.bottom -= statusY; - } -#endif // wxUSE_STATUSBAR - - wxPoint pt(GetClientAreaOrigin()); - rect.bottom -= pt.y; - rect.right -= pt.x; - - if ( x ) - *x = rect.right; - if ( y ) - *y = rect.bottom; -} +// ---------------------------------------------------------------------------- +// wxFrame client size calculations +// ---------------------------------------------------------------------------- -void wxFrameMSW::DoSetClientSize(int width, int height) +void wxFrame::DoSetClientSize(int width, int height) { // leave enough space for the status bar if we have (and show) it #if wxUSE_STATUSBAR @@ -178,14 +157,45 @@ void wxFrameMSW::DoSetClientSize(int width, int height) } #endif // wxUSE_STATUSBAR + // call GetClientAreaOrigin() to take the toolbar into account + wxPoint pt = GetClientAreaOrigin(); + width += pt.x; + height += pt.y; + wxTopLevelWindow::DoSetClientSize(width, height); } +// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. +void wxFrame::DoGetClientSize(int *x, int *y) const +{ + wxTopLevelWindow::DoGetClientSize(x, y); + + // account for the possible toolbar + wxPoint pt = GetClientAreaOrigin(); + if ( x ) + *x -= pt.x; + + if ( y ) + *y -= pt.y; + +#if wxUSE_STATUSBAR + // adjust client area height to take the status bar into account + if ( y ) + { + wxStatusBar *statbar = GetStatusBar(); + if ( statbar && statbar->IsShown() ) + { + *y -= statbar->GetClientSize().y; + } + } +#endif // wxUSE_STATUSBAR +} + // ---------------------------------------------------------------------------- -// wxFrameMSW: various geometry-related functions +// wxFrame: various geometry-related functions // ---------------------------------------------------------------------------- -void wxFrameMSW::Raise() +void wxFrame::Raise() { #ifdef __WIN16__ // no SetForegroundWindow() in Win16 @@ -196,7 +206,7 @@ void wxFrameMSW::Raise() } // generate an artificial resize event -void wxFrameMSW::SendSizeEvent() +void wxFrame::SendSizeEvent() { if ( !m_iconized ) { @@ -209,7 +219,7 @@ void wxFrameMSW::SendSizeEvent() } #if wxUSE_STATUSBAR -wxStatusBar *wxFrameMSW::OnCreateStatusBar(int number, +wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, const wxString& name) @@ -232,9 +242,9 @@ wxStatusBar *wxFrameMSW::OnCreateStatusBar(int number, return statusBar; } -void wxFrameMSW::PositionStatusBar() +void wxFrame::PositionStatusBar() { - if ( !m_frameStatusBar ) + if ( !m_frameStatusBar || !m_frameStatusBar->IsShown() ) return; int w, h; @@ -250,7 +260,7 @@ void wxFrameMSW::PositionStatusBar() #if wxUSE_MENUS_NATIVE -void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar) +void wxFrame::AttachMenuBar(wxMenuBar *menubar) { wxFrameBase::AttachMenuBar(menubar); @@ -282,7 +292,7 @@ void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar) } } -void wxFrameMSW::InternalSetMenuBar() +void wxFrame::InternalSetMenuBar() { #ifndef __WXMICROWIN__ if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) @@ -295,9 +305,9 @@ void wxFrameMSW::InternalSetMenuBar() #endif // wxUSE_MENUS_NATIVE // Responds to colour changes, and passes event on to children. -void wxFrameMSW::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); #if wxUSE_STATUSBAR @@ -314,7 +324,7 @@ void wxFrameMSW::OnSysColourChanged(wxSysColourChangedEvent& event) } // Pass TRUE to show full screen, FALSE to restore. -bool wxFrameMSW::ShowFullScreen(bool show, long style) +bool wxFrame::ShowFullScreen(bool show, long style) { if ( IsFullScreen() == show ) return FALSE; @@ -393,12 +403,12 @@ bool wxFrameMSW::ShowFullScreen(bool show, long style) // Default activation behaviour - set the focus for the first child // subwindow found. -void wxFrameMSW::OnActivate(wxActivateEvent& event) +void wxFrame::OnActivate(wxActivateEvent& event) { if ( event.GetActive() ) { // restore focus to the child which was last focused - wxLogTrace(_T("focus"), _T("wxFrameMSW %08x activated."), m_hWnd); + wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd); wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() : NULL; @@ -432,7 +442,7 @@ void wxFrameMSW::OnActivate(wxActivateEvent& event) } wxLogTrace(_T("focus"), - _T("wxFrameMSW %08x deactivated, last focused: %08x."), + _T("wxFrame %08x deactivated, last focused: %08x."), m_hWnd, m_winLastFocused ? GetHwndOf(m_winLastFocused) : NULL); @@ -447,7 +457,7 @@ void wxFrameMSW::OnActivate(wxActivateEvent& event) #if wxUSE_TOOLBAR -wxToolBar* wxFrameMSW::CreateToolBar(long style, wxWindowID id, const wxString& name) +wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { if ( wxFrameBase::CreateToolBar(style, id, name) ) { @@ -457,38 +467,42 @@ wxToolBar* wxFrameMSW::CreateToolBar(long style, wxWindowID id, const wxString& return m_frameToolBar; } -void wxFrameMSW::PositionToolBar() +void wxFrame::PositionToolBar() { - RECT rect; - ::GetClientRect(GetHwnd(), &rect); + wxToolBar *toolbar = GetToolBar(); + if ( toolbar && toolbar->IsShown() ) + { + // don't call our (or even wxTopLevelWindow) version because we want + // the real (full) client area size, not excluding the tool/status bar + int width, height; + wxWindow::DoGetClientSize(&width, &height); #if wxUSE_STATUSBAR - if ( GetStatusBar() ) - { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - rect.bottom -= statusY; - } + wxStatusBar *statbar = GetStatusBar(); + if ( statbar && statbar->IsShown() ) + { + height -= statbar->GetClientSize().y; + } #endif // wxUSE_STATUSBAR - if ( GetToolBar() && GetToolBar()->IsShown() ) - { int tw, th; - GetToolBar()->GetSize(&tw, &th); + toolbar->GetSize(&tw, &th); - if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) { - th = rect.bottom; + th = height; } else { - tw = rect.right; + tw = width; } - // Use the 'real' MSW position here - GetToolBar()->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS); + // use the 'real' MSW position here, don't offset relativly to the + // client area origin + toolbar->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS); } } + #endif // wxUSE_TOOLBAR // ---------------------------------------------------------------------------- @@ -498,7 +512,7 @@ void wxFrameMSW::PositionToolBar() // propagate our state change to all child frames: this allows us to emulate X // Windows behaviour where child frames float independently of the parent one // on the desktop, but are iconized/restored with it -void wxFrameMSW::IconizeChildFrames(bool bIconize) +void wxFrame::IconizeChildFrames(bool bIconize) { for ( wxWindowList::Node *node = GetChildren().GetFirst(); node; @@ -525,12 +539,26 @@ void wxFrameMSW::IconizeChildFrames(bool bIconize) #endif // wxUSE_MDI_ARCHITECTURE ) { - frame->Iconize(bIconize); + // we don't want to restore the child frames which had been + // iconized even before we were iconized, so save the child frame + // status when iconizing the parent frame and check it when + // restoring it + if ( bIconize ) + { + // note that we shouldn't touch the hidden frames neither + // because iconizing/restoring them would show them as a side + // effect + frame->m_wasMinimized = frame->IsIconized() || !frame->IsShown(); + } + + // this test works for both iconizing and restoring + if ( !frame->m_wasMinimized ) + frame->Iconize(bIconize); } } } -WXHICON wxFrameMSW::GetDefaultIcon() const +WXHICON wxFrame::GetDefaultIcon() const { return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON); @@ -544,7 +572,7 @@ WXHICON wxFrameMSW::GetDefaultIcon() const // preprocessing // --------------------------------------------------------------------------- -bool wxFrameMSW::MSWTranslateMessage(WXMSG* pMsg) +bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) { if ( wxWindow::MSWTranslateMessage(pMsg) ) return TRUE; @@ -566,7 +594,7 @@ bool wxFrameMSW::MSWTranslateMessage(WXMSG* pMsg) // our private (non virtual) message handlers // --------------------------------------------------------------------------- -bool wxFrameMSW::HandlePaint() +bool wxFrame::HandlePaint() { RECT rect; if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) @@ -617,7 +645,7 @@ bool wxFrameMSW::HandlePaint() } } -bool wxFrameMSW::HandleSize(int x, int y, WXUINT id) +bool wxFrame::HandleSize(int x, int y, WXUINT id) { bool processed = FALSE; #ifndef __WXMICROWIN__ @@ -671,7 +699,7 @@ bool wxFrameMSW::HandleSize(int x, int y, WXUINT id) return processed; } -bool wxFrameMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) +bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) { if ( control ) { @@ -703,7 +731,7 @@ bool wxFrameMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) return FALSE; } -bool wxFrameMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) +bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) { int item; if ( flags == 0xFFFF && hMenu == 0 ) @@ -741,10 +769,10 @@ bool wxFrameMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) } // --------------------------------------------------------------------------- -// the window proc for wxFrameMSW +// the window proc for wxFrame // --------------------------------------------------------------------------- -long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { long rc = 0; bool processed = FALSE;