X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe08e597048268b58f76f240e3f3dff52cdd6ffe..050c9e3c90c58b05d5b3f7384d1556ca9669f13e:/src/mac/carbon/frame.cpp diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index 04776b8cb1..81f6b40bee 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: frame.cpp -// Purpose: wxFrameMac +// Purpose: wxFrame // Author: AUTHOR // Modified by: // Created: ??/??/98 @@ -23,31 +23,27 @@ #include "wx/settings.h" #include "wx/app.h" -#include +#include "wx/mac/uma.h" extern wxWindowList wxModelessWindows; extern wxList wxPendingDelete; #if !USE_SHARED_LIBRARY -BEGIN_EVENT_TABLE(wxFrameMac, wxFrameBase) -// EVT_SIZE(wxFrameMac::OnSize) - EVT_ACTIVATE(wxFrameMac::OnActivate) - // EVT_MENU_HIGHLIGHT_ALL(wxFrameMac::OnMenuHighlight) - EVT_SYS_COLOUR_CHANGED(wxFrameMac::OnSysColourChanged) -// EVT_IDLE(wxFrameMac::OnIdle) -// EVT_CLOSE(wxFrameMac::OnCloseWindow) +BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) + EVT_ACTIVATE(wxFrame::OnActivate) + // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) + EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) +// EVT_IDLE(wxFrame::OnIdle) +// EVT_CLOSE(wxFrame::OnCloseWindow) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrameMac, wxWindow) -#endif -#ifndef __WXUNIVERSAL__ -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMac) +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) #endif #if wxUSE_NATIVE_STATUSBAR -bool wxFrameMac::m_useNativeStatusBar = TRUE; +bool wxFrame::m_useNativeStatusBar = TRUE; #else -bool wxFrameMac::m_useNativeStatusBar = FALSE; +bool wxFrame::m_useNativeStatusBar = FALSE; #endif #define WX_MAC_STATUSBAR_HEIGHT 15 @@ -55,7 +51,7 @@ bool wxFrameMac::m_useNativeStatusBar = FALSE; // creation/destruction // ---------------------------------------------------------------------------- -void wxFrameMac::Init() +void wxFrame::Init() { m_frameMenuBar = NULL; @@ -72,7 +68,7 @@ void wxFrameMac::Init() #endif } -wxPoint wxFrameMac::GetClientAreaOrigin() const +wxPoint wxFrame::GetClientAreaOrigin() const { // on mac we are at position -1,-1 with the control wxPoint pt(0, 0); @@ -97,7 +93,7 @@ wxPoint wxFrameMac::GetClientAreaOrigin() const return pt; } -bool wxFrameMac::Create(wxWindow *parent, +bool wxFrame::Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos, @@ -107,15 +103,8 @@ bool wxFrameMac::Create(wxWindow *parent, { 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 ) ; @@ -126,30 +115,16 @@ bool wxFrameMac::Create(wxWindow *parent, return TRUE; } -wxFrameMac::~wxFrameMac() +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); } -bool wxFrameMac::Enable(bool enable) +bool wxFrame::Enable(bool enable) { if ( !wxWindow::Enable(enable) ) return FALSE; @@ -165,7 +140,7 @@ bool wxFrameMac::Enable(bool enable) return TRUE; } -wxStatusBar *wxFrameMac::OnCreateStatusBar(int number, long style, wxWindowID id, +wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, const wxString& name) { wxStatusBar *statusBar = NULL; @@ -177,7 +152,7 @@ wxStatusBar *wxFrameMac::OnCreateStatusBar(int number, long style, wxWindowID id return statusBar; } -void wxFrameMac::PositionStatusBar() +void wxFrame::PositionStatusBar() { if (m_frameStatusBar ) { @@ -193,7 +168,7 @@ void wxFrameMac::PositionStatusBar() } // Responds to colour changes, and passes event on to children. -void wxFrameMac::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); @@ -212,50 +187,43 @@ void wxFrameMac::OnSysColourChanged(wxSysColourChangedEvent& event) // Default activation behaviour - set the focus for the first child // subwindow found. -void wxFrameMac::OnActivate(wxActivateEvent& event) +void wxFrame::OnActivate(wxActivateEvent& event) { if ( !event.GetActive() ) { - // remember the last focused child + // remember the last focused child if it is our child m_winLastFocused = FindFocus(); - while ( m_winLastFocused ) + + // so we NULL it out if it's a child from some other frame + wxWindow *win = m_winLastFocused; + while ( win ) { - if ( GetChildren().Find(m_winLastFocused) ) + if ( win->IsTopLevel() ) + { + if ( win != this ) + { + m_winLastFocused = NULL; + } + break; + } - m_winLastFocused = m_winLastFocused->GetParent(); + win = win->GetParent(); } event.Skip(); } else { -/* - 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? - - // restore focus - wxWindow *child = node->GetData(); - - if ( !child->IsTopLevel() && child->AcceptsFocus() -#if wxUSE_TOOLBAR - && !wxDynamicCast(child, wxToolBar) -#endif // wxUSE_TOOLBAR -#if wxUSE_STATUSBAR - && !wxDynamicCast(child, wxStatusBar) -#endif // wxUSE_STATUSBAR - ) + // restore focus to the child which was last focused + wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() + : NULL; + if ( !parent ) { - child->SetFocus(); - break; + parent = this; } - } - */ - wxSetFocusToChild(this, &m_winLastFocused); + + wxSetFocusToChild(parent, &m_winLastFocused); if ( m_frameMenuBar != NULL ) { @@ -264,7 +232,7 @@ void wxFrameMac::OnActivate(wxActivateEvent& event) } } -void wxFrameMac::DoGetClientSize(int *x, int *y) const +void wxFrame::DoGetClientSize(int *x, int *y) const { wxWindow::DoGetClientSize( x , y ) ; @@ -284,7 +252,7 @@ void wxFrameMac::DoGetClientSize(int *x, int *y) const *x -= pt.x; } -void wxFrameMac::DoSetClientSize(int clientwidth, int clientheight) +void wxFrame::DoSetClientSize(int clientwidth, int clientheight) { int currentclientwidth , currentclientheight ; int currentwidth , currentheight ; @@ -304,7 +272,7 @@ void wxFrameMac::DoSetClientSize(int clientwidth, int clientheight) #if wxUSE_TOOLBAR -wxToolBar* wxFrameMac::CreateToolBar(long style, wxWindowID id, const wxString& name) +wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { if ( wxFrameBase::CreateToolBar(style, id, name) ) { @@ -314,7 +282,7 @@ wxToolBar* wxFrameMac::CreateToolBar(long style, wxWindowID id, const wxString& return m_frameToolBar; } -void wxFrameMac::PositionToolBar() +void wxFrame::PositionToolBar() { int cw, ch;