X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a7d70fe8922a56407a5b02b95a53fb16e787f70..947f3b358cae28b63c6f69af21c493cab355fb7e:/src/mac/carbon/mdi.cpp diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp index 8c8c790c6f..3f3131746c 100644 --- a/src/mac/carbon/mdi.cpp +++ b/src/mac/carbon/mdi.cpp @@ -1,20 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mdi.cpp +// Name: src/mac/carbon/mdi.cpp // Purpose: MDI classes // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" #if wxUSE_MDI +#include "wx/mdi.h" + #ifndef WX_PRECOMP - #include "wx/mdi.h" #include "wx/log.h" #include "wx/menu.h" #include "wx/settings.h" @@ -31,30 +32,52 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow) BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame) - EVT_ACTIVATE(wxMDIParentFrame::OnActivate) - EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged) + EVT_ACTIVATE(wxMDIParentFrame::OnActivate) + EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow) - EVT_SCROLL(wxMDIClientWindow::OnScroll) + EVT_SCROLL(wxMDIClientWindow::OnScroll) END_EVENT_TABLE() -static const wxChar *TRACE_MDI = _T("mdi"); +#define TRACE_MDI "mdi" -static const int IDM_WINDOWTILE = 4001; static const int IDM_WINDOWTILEHOR = 4001; static const int IDM_WINDOWCASCADE = 4002; static const int IDM_WINDOWICONS = 4003; static const int IDM_WINDOWNEXT = 4004; static const int IDM_WINDOWTILEVERT = 4005; -static const int IDM_WINDOWPREV = 4006; -// This range gives a maximum of 500 MDI children. Should be enough :-) -static const int wxFIRST_MDI_CHILD = 4100; -static const int wxLAST_MDI_CHILD = 4600; +// others -// Status border dimensions -static const int wxTHICK_LINE_BORDER = 3; +void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) +{ +#if 1 // TODO REMOVE + if ( inWindowRef ) + { +// bool isHighlighted = IsWindowHighlited( inWindowRef ) ; +// if ( inActivate != isHighlighted ) +#ifndef __LP64__ + GrafPtr port ; + GetPort( &port ) ; + SetPortWindowPort( inWindowRef ) ; +#endif + HiliteWindow( inWindowRef , inActivate ) ; + ControlRef control = NULL ; + ::GetRootControl( inWindowRef , &control ) ; + if ( control ) + { + if ( inActivate ) + ::ActivateControl( control ) ; + else + ::DeactivateControl( control ) ; + } +#ifndef __LP64__ + SetPort( port ) ; +#endif + } +#endif +} // ---------------------------------------------------------------------------- // Parent frame @@ -96,12 +119,14 @@ bool wxMDIParentFrame::Create(wxWindow *parent, m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next")); } - wxFrame::Create( parent , id , title , pos , size , style , name ) ; + if ( !wxFrame::Create( parent , id , title , pos , size , style , name ) ) + return false; + m_parentFrameActive = true; - OnCreateClient(); + m_clientWindow = OnCreateClient(); - return true; + return m_clientWindow != NULL; } wxMDIParentFrame::~wxMDIParentFrame() @@ -131,6 +156,9 @@ void wxMDIParentFrame::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h void wxMDIParentFrame::AddChild(wxWindowBase *child) { + // moved this to front, so that we don't run into unset m_parent problems later + wxFrame::AddChild(child); + if ( !m_currentChild ) { m_currentChild = wxDynamicCast(child, wxMDIChildFrame); @@ -142,8 +170,6 @@ void wxMDIParentFrame::AddChild(wxWindowBase *child) m_shouldBeShown = true; } } - - wxFrame::AddChild(child); } void wxMDIParentFrame::RemoveChild(wxWindowBase *child) @@ -251,9 +277,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const // just return a new class) wxMDIClientWindow *wxMDIParentFrame::OnCreateClient() { - m_clientWindow = new wxMDIClientWindow( this ); - - return m_clientWindow; + return new wxMDIClientWindow( this ); } // Responds to colour changes, and passes event on to children. @@ -302,7 +326,7 @@ bool wxMDIParentFrame::ShouldBeVisible() const if ( win->IsShown() && !wxDynamicCast(win, wxMDIChildFrame) #if wxUSE_STATUSBAR - && win != GetStatusBar() + && win != (wxWindow*) GetStatusBar() #endif && win != GetClientWindow() ) { @@ -350,29 +374,30 @@ 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 + if ( id == wxID_ANY ) m_windowId = (int)NewControlId(); + else + m_windowId = id; if (parent) parent->AddChild(this); + MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); wxModelessWindows.Append(this); - return false; + + return true; } wxMDIChildFrame::~wxMDIChildFrame() @@ -387,29 +412,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); @@ -417,18 +448,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; } } @@ -464,10 +496,11 @@ wxMDIClientWindow::~wxMDIClientWindow() bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) { - if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style)) + if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style) ) return false; - + wxModelessWindows.Append(this); + return true; } @@ -478,9 +511,8 @@ void wxMDIClientWindow::DoGetClientSize(int *x, int *y) const } // Explicitly call default scroll behaviour -void wxMDIClientWindow::OnScroll(wxScrollEvent& event) +void wxMDIClientWindow::OnScroll(wxScrollEvent& WXUNUSED(event)) { } #endif // wxUSE_MDI -