X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..2fb4d7b86e82851bafd4620418e0e404fc801f1c:/src/mac/carbon/frame.cpp diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index b5498fec48..81f6b40bee 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -14,7 +14,7 @@ #endif #include "wx/frame.h" -#include "wx/mac/statusbr.h" +#include "wx/statusbr.h" #include "wx/toolbar.h" #include "wx/menuitem.h" #include "wx/menu.h" @@ -23,14 +23,13 @@ #include "wx/settings.h" #include "wx/app.h" -#include +#include "wx/mac/uma.h" -extern wxList wxModelessWindows; +extern wxWindowList wxModelessWindows; extern wxList wxPendingDelete; #if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) -// EVT_SIZE(wxFrame::OnSize) EVT_ACTIVATE(wxFrame::OnActivate) // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) @@ -38,7 +37,7 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) // EVT_CLOSE(wxFrame::OnCloseWindow) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) #endif #if wxUSE_NATIVE_STATUSBAR @@ -54,6 +53,14 @@ bool wxFrame::m_useNativeStatusBar = FALSE; void wxFrame::Init() { + m_frameMenuBar = NULL; + +#if wxUSE_TOOLBAR + m_frameToolBar = NULL ; +#endif + m_frameStatusBar = NULL; + m_winLastFocused = NULL ; + m_iconized = FALSE; #if wxUSE_TOOLTIPS @@ -94,24 +101,10 @@ bool wxFrame::Create(wxWindow *parent, long style, const wxString& name) { - m_frameMenuBar = NULL; - -#if wxUSE_TOOLBAR - m_frameToolBar = NULL ; -#endif - m_frameStatusBar = NULL; - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); - if ( id > -1 ) - m_windowId = id; - else - m_windowId = (int)NewControlId(); - - if (parent) parent->AddChild(this); - - if (!parent) - wxTopLevelWindows.Append(this); + if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) + return FALSE; MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; @@ -125,23 +118,9 @@ bool wxFrame::Create(wxWindow *parent, wxFrame::~wxFrame() { m_isBeingDeleted = TRUE; - wxTopLevelWindows.DeleteObject(this); DeleteAllBars(); -/* Check if it's the last top-level window */ - - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) - { - wxTheApp->SetTopWindow(NULL); - - if (wxTheApp->GetExitOnFrameDelete()) - { - wxTheApp->ExitMainLoop() ; - } - } - - wxModelessWindows.DeleteObject(this); } @@ -160,47 +139,15 @@ bool wxFrame::Enable(bool enable) return TRUE; } -// Equivalent to maximize/restore in Windows -void wxFrame::Maximize(bool maximize) -{ - // TODO -} - -bool wxFrame::IsIconized() const -{ - // TODO - return FALSE; -} - -void wxFrame::Iconize(bool iconize) -{ - // TODO -} - -// Is the frame maximized? -bool wxFrame::IsMaximized(void) const -{ - // TODO - return FALSE; -} - -void wxFrame::Restore() -{ - // TODO -} - -void wxFrame::SetIcon(const wxIcon& icon) -{ - wxFrameBase::SetIcon(icon); -} wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, const wxString& name) { wxStatusBar *statusBar = NULL; - statusBar = new wxStatusBar(this, id, style, name); - + statusBar = new wxStatusBar(this, id, + style, name); + statusBar->SetSize( 100 , 15 ) ; statusBar->SetFieldsCount(number); return statusBar; } @@ -216,24 +163,10 @@ void wxFrame::PositionStatusBar() // Since we wish the status bar to be directly under the client area, // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS. - m_frameStatusBar->SetSize(0, h, w, WX_MAC_STATUSBAR_HEIGHT ); + m_frameStatusBar->SetSize(0, h, w, sh); } } -void wxFrame::SetMenuBar(wxMenuBar *menuBar) -{ - if (!menuBar) - { - return; - } - - m_frameMenuBar = NULL; - m_frameMenuBar = menuBar; - m_frameMenuBar->MacInstallMenuBar() ; - m_frameMenuBar->Attach(this); -} - - // Responds to colour changes, and passes event on to children. void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { @@ -258,33 +191,45 @@ void wxFrame::OnActivate(wxActivateEvent& event) { if ( !event.GetActive() ) { - event.Skip(); - return; - } + // remember the last focused child if it is our child + m_winLastFocused = FindFocus(); - for ( wxWindowList::Node *node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - // FIXME all this is totally bogus - we need to do the same as wxPanel, - // but how to do it without duplicating the code? + // so we NULL it out if it's a child from some other frame + wxWindow *win = m_winLastFocused; + while ( win ) + { + if ( win->IsTopLevel() ) + { + if ( win != this ) + { + m_winLastFocused = NULL; + } - // restore focus - wxWindow *child = node->GetData(); + break; + } - if ( !child->IsTopLevel() -#if wxUSE_TOOLBAR - && !wxDynamicCast(child, wxToolBar) -#endif // wxUSE_TOOLBAR -#if wxUSE_STATUSBAR - && !wxDynamicCast(child, wxStatusBar) -#endif // wxUSE_STATUSBAR - ) - { - child->SetFocus(); - return; + win = win->GetParent(); } + + event.Skip(); } + else + { + // restore focus to the child which was last focused + wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() + : NULL; + if ( !parent ) + { + parent = this; + } + + wxSetFocusToChild(parent, &m_winLastFocused); + + if ( m_frameMenuBar != NULL ) + { + m_frameMenuBar->MacInstallMenuBar() ; + } + } } void wxFrame::DoGetClientSize(int *x, int *y) const @@ -292,18 +237,19 @@ void wxFrame::DoGetClientSize(int *x, int *y) const wxWindow::DoGetClientSize( x , y ) ; #if wxUSE_STATUSBAR - if ( GetStatusBar() ) + if ( GetStatusBar() && y ) { int statusX, statusY; GetStatusBar()->GetClientSize(&statusX, &statusY); - // right now this is a constant, this might change someday - *y -= WX_MAC_STATUSBAR_HEIGHT ; + *y -= statusY; } #endif // wxUSE_STATUSBAR wxPoint pt(GetClientAreaOrigin()); - *y -= pt.y; - *x -= pt.x; + if ( y ) + *y -= pt.y; + if ( x ) + *x -= pt.x; } void wxFrame::DoSetClientSize(int clientwidth, int clientheight)