X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a60e3f007c8d63e0957dca431e4559fc7fcfbe6..9dc1d18069c519c807c2476a837e710b5ef932c6:/src/mac/carbon/mdi.cpp diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp index b79928d8f6..503efaaa61 100644 --- a/src/mac/carbon/mdi.cpp +++ b/src/mac/carbon/mdi.cpp @@ -9,18 +9,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "mdi.h" -#endif - #include "wx/wxprec.h" #if wxUSE_MDI -#include "wx/mdi.h" -#include "wx/menu.h" -#include "wx/settings.h" -#include "wx/log.h" +#ifndef WX_PRECOMP + #include "wx/mdi.h" + #include "wx/log.h" + #include "wx/menu.h" + #include "wx/settings.h" + #include "wx/statusbr.h" +#endif #include "wx/mac/private.h" #include "wx/mac/uma.h" @@ -57,27 +56,27 @@ static const int wxLAST_MDI_CHILD = 4600; // Status border dimensions static const int wxTHICK_LINE_BORDER = 3; +// ---------------------------------------------------------------------------- // Parent frame +// ---------------------------------------------------------------------------- -wxMDIParentFrame::wxMDIParentFrame() +void wxMDIParentFrame::Init() { m_clientWindow = NULL; m_currentChild = NULL; m_windowMenu = (wxMenu*) NULL; - m_parentFrameActive = TRUE; + m_parentFrameActive = true; + m_shouldBeShown = false; } bool wxMDIParentFrame::Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { - m_clientWindow = NULL; - m_currentChild = NULL; - // this style can be used to prevent a window from having the standard MDI // "Window" menu if ( style & wxFRAME_NO_WINDOW_MENU ) @@ -88,7 +87,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent, else // normal case: we have the window menu, so construct it { m_windowMenu = new wxMenu; - + m_windowMenu->Append(IDM_WINDOWCASCADE, wxT("&Cascade")); m_windowMenu->Append(IDM_WINDOWTILEHOR, wxT("Tile &Horizontally")); m_windowMenu->Append(IDM_WINDOWTILEVERT, wxT("Tile &Vertically")); @@ -96,25 +95,25 @@ bool wxMDIParentFrame::Create(wxWindow *parent, m_windowMenu->Append(IDM_WINDOWICONS, wxT("&Arrange Icons")); m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next")); } - + wxFrame::Create( parent , id , title , pos , size , style , name ) ; - m_parentFrameActive = TRUE; - + m_parentFrameActive = true; + OnCreateClient(); - - return TRUE; + + return true; } wxMDIParentFrame::~wxMDIParentFrame() { DestroyChildren(); + // already deleted by DestroyChildren() m_clientWindow = NULL ; - + delete m_windowMenu; } - void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar) { wxFrame::SetMenuBar( menu_bar ) ; @@ -122,54 +121,116 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar) void wxMDIParentFrame::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h) { - if(x) + if (x) *x = 0; - if(y) + if (y) *y = 0; - wxDisplaySize(w,h); + + wxDisplaySize(w, h); +} + +void wxMDIParentFrame::AddChild(wxWindowBase *child) +{ + if ( !m_currentChild ) + { + m_currentChild = wxDynamicCast(child, wxMDIChildFrame); + + if ( m_currentChild && IsShown() && !ShouldBeVisible() ) + { + // we shouldn't remain visible any more + wxFrame::Show(false); + m_shouldBeShown = true; + } + } + + wxFrame::AddChild(child); +} + +void wxMDIParentFrame::RemoveChild(wxWindowBase *child) +{ + if ( child == m_currentChild ) + { + // the current child isn't active any more, try to find another one + m_currentChild = NULL; + + for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); + node; + node = node->GetNext() ) + { + wxMDIChildFrame * + childCur = wxDynamicCast(node->GetData(), wxMDIChildFrame); + if ( childCur != child ) + { + m_currentChild = childCur; + break; + } + } + } + + wxFrame::RemoveChild(child); + + // if there are no more children left we need to show the frame if we + // hadn't shown it before because there were active children and it was + // useless (note that we have to do it after fully removing the child, i.e. + // after calling the base class RemoveChild() as otherwise we risk to touch + // pointer to the child being deleted) + if ( !m_currentChild && m_shouldBeShown && !IsShown() ) + { + // we have to show it, but at least move it out of sight and make it of + // smallest possible size (unfortunately (0, 0) doesn't work so that it + // doesn't appear in expose + SetSize(-10000, -10000, 1, 1); + Show(); + } } void wxMDIParentFrame::MacActivate(long timestamp, bool activating) { - wxLogTrace(TRACE_MDI, wxT("MDI PARENT=%p MacActivate(0x%08lx,%s)"),this,timestamp,activating?wxT("ACTIV"):wxT("deact")); - if(activating) + wxLogTrace(TRACE_MDI, wxT("MDI PARENT=%p MacActivate(0x%08lx,%s)"), this, timestamp, activating ? wxT("ACTIV") : wxT("deact")); + + if (activating) { - if(s_macDeactivateWindow && s_macDeactivateWindow->GetParent()==this) + if (s_macDeactivateWindow && s_macDeactivateWindow->GetParent() == this) { wxLogTrace(TRACE_MDI, wxT("child had been scheduled for deactivation, rehighlighting")); + UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true); - wxLogTrace(TRACE_MDI, wxT("done highliting child")); + + wxLogTrace(TRACE_MDI, wxT("finished highliting child")); + s_macDeactivateWindow = NULL; } - else if(s_macDeactivateWindow == this) + else if (s_macDeactivateWindow == this) { wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"), this); + s_macDeactivateWindow = NULL; } else // window to deactivate is NULL or is not us or one of our kids { // activate kid instead - if(m_currentChild) - m_currentChild->MacActivate(timestamp,activating); + if (m_currentChild) + m_currentChild->MacActivate(timestamp, activating); else - wxFrame::MacActivate(timestamp,activating); + wxFrame::MacActivate(timestamp, activating); } } else { // We were scheduled for deactivation, and now we do it. - if(s_macDeactivateWindow==this) + if (s_macDeactivateWindow == this) { s_macDeactivateWindow = NULL; - if(m_currentChild) - m_currentChild->MacActivate(timestamp,activating); - wxFrame::MacActivate(timestamp,activating); + if (m_currentChild) + m_currentChild->MacActivate(timestamp, activating); + wxFrame::MacActivate(timestamp, activating); } else // schedule ourselves for deactivation { - if(s_macDeactivateWindow) - wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"),s_macDeactivateWindow); + if (s_macDeactivateWindow) + wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"), s_macDeactivateWindow); wxLogTrace(TRACE_MDI, wxT("Scheduling delayed MDI Parent deactivation")); + s_macDeactivateWindow = this; } } @@ -191,6 +252,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() { m_clientWindow = new wxMDIClientWindow( this ); + return m_clientWindow; } @@ -198,7 +260,7 @@ wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { // TODO - + // Propagate the event to the non-top-level children wxFrame::OnSysColourChanged(event); } @@ -229,29 +291,55 @@ void wxMDIParentFrame::ActivatePrevious() // TODO } +bool wxMDIParentFrame::ShouldBeVisible() const +{ + for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); + node; + node = node->GetNext() ) + { + wxWindow *win = node->GetData(); + + if ( win->IsShown() + && !wxDynamicCast(win, wxMDIChildFrame) +#if wxUSE_STATUSBAR + && win != (wxWindow*) GetStatusBar() +#endif + && win != GetClientWindow() ) + { + // if we have a non-MDI child, do remain visible so that it could + // be used + return true; + } + } + + return false; +} + bool wxMDIParentFrame::Show( bool show ) { + m_shouldBeShown = false; + // don't really show the MDI frame unless it has any children other than // MDI children as it is pretty useless in this case if ( show ) { - // TODO: check for other children - if ( !GetToolBar() ) + if ( !ShouldBeVisible() && m_currentChild ) { - // call the base class version to just update the flag but don't - // really make the window visible - return wxFrameBase::Show(); + // don't make the window visible now but remember that we should + // have had done it + m_shouldBeShown = true; + + return false; } } - if ( !wxFrame::Show(show) ) - return false; - - return true; + return wxFrame::Show(show); } +// ---------------------------------------------------------------------------- // Child frame +// ---------------------------------------------------------------------------- wxMDIChildFrame::wxMDIChildFrame() { @@ -262,36 +350,34 @@ void wxMDIChildFrame::Init() } bool wxMDIChildFrame::Create(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) + wxWindowID id, + const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { SetName(name); - + if ( id > -1 ) m_windowId = id; else m_windowId = (int)NewControlId(); - - if (parent) parent->AddChild(this); - + + if (parent) + parent->AddChild(this); + MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; - + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); wxModelessWindows.Append(this); - return FALSE; + + return false; } wxMDIChildFrame::~wxMDIChildFrame() { - wxMDIParentFrame *mdiparent = wxDynamicCast(m_parent, wxMDIParentFrame); - wxASSERT(mdiparent); - if(mdiparent->m_currentChild == this) - mdiparent->m_currentChild = NULL; DestroyChildren(); } @@ -302,29 +388,35 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar) void wxMDIChildFrame::MacActivate(long timestamp, bool activating) { - wxLogTrace(TRACE_MDI, wxT("MDI child=%p MacActivate(0x%08lx,%s)"),this,timestamp,activating?wxT("ACTIV"):wxT("deact")); + wxLogTrace(TRACE_MDI, wxT("MDI child=%p MacActivate(0x%08lx,%s)"),this, timestamp, activating ? wxT("ACTIV") : wxT("deact")); + wxMDIParentFrame *mdiparent = wxDynamicCast(m_parent, wxMDIParentFrame); wxASSERT(mdiparent); - if(activating) + + if (activating) { - if(s_macDeactivateWindow == m_parent) + if (s_macDeactivateWindow == m_parent) { wxLogTrace(TRACE_MDI, wxT("parent had been scheduled for deactivation, rehighlighting")); + UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true); - wxLogTrace(TRACE_MDI, wxT("done highliting parent")); + + wxLogTrace(TRACE_MDI, wxT("finished highliting parent")); + s_macDeactivateWindow = NULL; } - else if((mdiparent->m_currentChild==this) || !s_macDeactivateWindow) - mdiparent->wxFrame::MacActivate(timestamp,activating); - - if(mdiparent->m_currentChild && mdiparent->m_currentChild!=this) - mdiparent->m_currentChild->wxFrame::MacActivate(timestamp,false); + else if ((mdiparent->m_currentChild == this) || !s_macDeactivateWindow) + mdiparent->wxFrame::MacActivate(timestamp, activating); + + if (mdiparent->m_currentChild && mdiparent->m_currentChild != this) + mdiparent->m_currentChild->wxFrame::MacActivate(timestamp, false); mdiparent->m_currentChild = this; - if(s_macDeactivateWindow==this) + if (s_macDeactivateWindow == this) { - wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"),this); - s_macDeactivateWindow=NULL; + wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"), this); + + s_macDeactivateWindow = NULL; } else wxFrame::MacActivate(timestamp, activating); @@ -332,18 +424,19 @@ void wxMDIChildFrame::MacActivate(long timestamp, bool activating) else { // We were scheduled for deactivation, and now we do it. - if(s_macDeactivateWindow==this) + if (s_macDeactivateWindow == this) { s_macDeactivateWindow = NULL; - wxFrame::MacActivate(timestamp,activating); - if(mdiparent->m_currentChild==this) - mdiparent->wxFrame::MacActivate(timestamp,activating); + wxFrame::MacActivate(timestamp, activating); + if (mdiparent->m_currentChild == this) + mdiparent->wxFrame::MacActivate(timestamp, activating); } else // schedule ourselves for deactivation { - if(s_macDeactivateWindow) - wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"),s_macDeactivateWindow); + if (s_macDeactivateWindow) + wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"), s_macDeactivateWindow); wxLogTrace(TRACE_MDI, wxT("Scheduling delayed deactivation")); + s_macDeactivateWindow = this; } } @@ -379,11 +472,12 @@ wxMDIClientWindow::~wxMDIClientWindow() bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) { - if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style)) - return FALSE; - + if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style) ) + return false; + wxModelessWindows.Append(this); - return TRUE; + + return true; } // Get size *available for subwindows* i.e. excluding menu bar. @@ -397,5 +491,5 @@ void wxMDIClientWindow::OnScroll(wxScrollEvent& event) { } -#endif +#endif // wxUSE_MDI