X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/326d5a744fc79c31d3fe0acaf175bd1d9cf4ae07..b1a1a83c929126a9183a7e1f93646484bbd95b1b:/src/mac/carbon/frame.cpp diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index ac1391d4de..399749a1b3 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -9,9 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "frame.h" -#endif +#include "wx/wxprec.h" #include "wx/frame.h" #include "wx/statusbr.h" @@ -28,7 +26,6 @@ extern wxWindowList wxModelessWindows; extern wxList wxPendingDelete; -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_ACTIVATE(wxFrame::OnActivate) // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) @@ -38,9 +35,9 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) -#endif -#define WX_MAC_STATUSBAR_HEIGHT 18 +#define WX_MAC_STATUSBAR_HEIGHT 18 + // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- @@ -48,18 +45,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) void wxFrame::Init() { m_frameMenuBar = NULL; - + m_frameStatusBar = NULL; + m_winLastFocused = NULL; + #if wxUSE_TOOLBAR - m_frameToolBar = NULL ; + m_frameToolBar = NULL; #endif - m_frameStatusBar = NULL; - m_winLastFocused = NULL ; - - m_iconized = FALSE; - + #if wxUSE_TOOLTIPS - m_hwndToolTip = 0; + // NB: is this used anywhere? + m_hwndToolTip = NULL; #endif + + m_iconized = false; } bool wxFrame::Create(wxWindow *parent, @@ -70,48 +68,75 @@ bool wxFrame::Create(wxWindow *parent, long style, const wxString& name) { - + if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) - return FALSE; - + return false; + wxModelessWindows.Append(this); - - return TRUE; + + return true; } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; DeleteAllBars(); } +// get the origin of the client area in the client coordinates +wxPoint wxFrame::GetClientAreaOrigin() const +{ + wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin(); + +#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) + wxToolBar *toolbar = GetToolBar(); + if ( toolbar && toolbar->IsShown() ) + { + int w, h; + toolbar->GetSize(&w, &h); + + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) + { + pt.x += w; + } + else + { +#if !wxMAC_USE_NATIVE_TOOLBAR + pt.y += h; +#endif + } + } +#endif + + return pt; +} bool wxFrame::Enable(bool enable) { if ( !wxWindow::Enable(enable) ) - return FALSE; + return false; if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() ) { - int iMaxMenu = m_frameMenuBar->GetMenuCount(); + int iMaxMenu = m_frameMenuBar->GetMenuCount(); for ( int i = 0 ; i < iMaxMenu ; ++ i ) { m_frameMenuBar->EnableTop( i , enable ) ; } } - return TRUE; + return true; } wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, const wxString& name) { - wxStatusBar *statusBar = NULL; + wxStatusBar *statusBar; - statusBar = new wxStatusBar(this, id, - style, name); - statusBar->SetSize( 100 , WX_MAC_STATUSBAR_HEIGHT ) ; + statusBar = new wxStatusBar(this, id, style, name); + statusBar->SetSize(100 , WX_MAC_STATUSBAR_HEIGHT); statusBar->SetFieldsCount(number); + return statusBar; } @@ -121,7 +146,7 @@ void wxFrame::PositionStatusBar() { int w, h; GetClientSize(&w, &h); - + // 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); @@ -137,6 +162,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) if ( m_frameStatusBar ) { wxSysColourChangedEvent event2; + event2.SetEventObject( m_frameStatusBar ); m_frameStatusBar->ProcessEvent(event2); } @@ -145,7 +171,6 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) wxWindow::OnSysColourChanged(event); } - // Default activation behaviour - set the focus for the first child // subwindow found. void wxFrame::OnActivate(wxActivateEvent& event) @@ -162,9 +187,7 @@ void wxFrame::OnActivate(wxActivateEvent& event) if ( win->IsTopLevel() ) { if ( win != this ) - { m_winLastFocused = NULL; - } break; } @@ -177,23 +200,23 @@ void wxFrame::OnActivate(wxActivateEvent& event) else { // restore focus to the child which was last focused - wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() - : NULL; + wxWindow *parent = m_winLastFocused + ? m_winLastFocused->GetParent() + : NULL; + if ( !parent ) - { parent = this; - } wxSetFocusToChild(parent, &m_winLastFocused); - if ( m_frameMenuBar != NULL ) + if (m_frameMenuBar != NULL) { m_frameMenuBar->MacInstallMenuBar() ; } else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame))) { - // Trying toplevel frame menbar - if( ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar() ) + // Trying toplevel frame membar + if (((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()) ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar(); } } @@ -202,34 +225,42 @@ void wxFrame::OnActivate(wxActivateEvent& event) void wxFrame::DetachMenuBar() { if ( m_frameMenuBar ) - { m_frameMenuBar->UnsetInvokingWindow(); - } wxFrameBase::DetachMenuBar(); } void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) { - wxFrameBase::AttachMenuBar(menuBar); + wxFrame* tlf = wxDynamicCast( wxFindWinFromMacWindow( FrontNonFloatingWindow() ) , wxFrame ); + bool makeCurrent = false; + + // if this is already the current menubar or we are the frontmost window + if ( (tlf == this) || (m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar()) ) + makeCurrent = true; + // or there is an app-level menubar like MDI + else if ( tlf && (tlf->GetMenuBar() == NULL) && (((wxFrame*)wxTheApp->GetTopWindow()) == this) ) + makeCurrent = true; + + wxFrameBase::AttachMenuBar( menuBar ); if (m_frameMenuBar) { m_frameMenuBar->SetInvokingWindow( this ); + if (makeCurrent) + m_frameMenuBar->MacInstallMenuBar(); } } void wxFrame::DoGetClientSize(int *x, int *y) const { - wxTopLevelWindow::DoGetClientSize( x , y ) ; - + wxTopLevelWindow::DoGetClientSize( x , y ); + #if wxUSE_STATUSBAR if ( GetStatusBar() && GetStatusBar()->IsShown() && y ) - { - if ( y) *y -= WX_MAC_STATUSBAR_HEIGHT; - } -#endif // wxUSE_STATUSBAR - + *y -= WX_MAC_STATUSBAR_HEIGHT; +#endif + #if wxUSE_TOOLBAR wxToolBar *toolbar = GetToolBar(); if ( toolbar && toolbar->IsShown() ) @@ -239,46 +270,78 @@ void wxFrame::DoGetClientSize(int *x, int *y) const if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) { - if ( x ) *x -= w; + if ( x ) + *x -= w; } else { - if ( y ) *y -= h; +#if !wxMAC_USE_NATIVE_TOOLBAR + if ( y ) + *y -= h; +#endif } } -#endif // wxUSE_TOOLBAR +#endif +} + +bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const +{ +#if wxUSE_STATUSBAR + if ( child == GetStatusBar() ) + return false ; +#endif + +#if wxUSE_TOOLBAR + if ( child == GetToolBar() ) + return false ; +#endif + + return wxFrameBase::MacIsChildOfClientArea( child ) ; } void wxFrame::DoSetClientSize(int clientwidth, int clientheight) { int currentclientwidth , currentclientheight ; int currentwidth , currentheight ; - + GetClientSize( ¤tclientwidth , ¤tclientheight ) ; if ( clientwidth == -1 ) clientwidth = currentclientwidth ; if ( clientheight == -1 ) clientheight = currentclientheight ; GetSize( ¤twidth , ¤theight ) ; - - // find the current client size - // Find the difference between the entire window (title bar and all) - // and the client area; add this to the new client size to move the - // window + // find the current client size + // Find the difference between the entire window (title bar and all) and + // the client area; add this to the new client size to move the window DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth , currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ; } - #if wxUSE_TOOLBAR +void wxFrame::SetToolBar(wxToolBar *toolbar) +{ + if ( m_frameToolBar == toolbar ) + return ; + +#if wxMAC_USE_NATIVE_TOOLBAR + if ( m_frameToolBar ) + m_frameToolBar->MacInstallNativeToolbar( false ) ; +#endif + + m_frameToolBar = toolbar ; + +#if wxMAC_USE_NATIVE_TOOLBAR + if ( toolbar ) + toolbar->MacInstallNativeToolbar( true ) ; +#endif +} + wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { if ( wxFrameBase::CreateToolBar(style, id, name) ) - { PositionToolBar(); - } return m_frameToolBar; } @@ -289,19 +352,20 @@ void wxFrame::PositionToolBar() GetSize( &cw , &ch ) ; - if ( GetStatusBar() && GetStatusBar()->IsShown()) + if (GetStatusBar() && GetStatusBar()->IsShown()) { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - ch -= statusY; + int statusX, statusY; + + GetStatusBar()->GetClientSize(&statusX, &statusY); + ch -= statusY; } if (GetToolBar()) { int tx, ty, tw, th; + tx = ty = 0 ; - - GetToolBar()->GetSize(& tw, & th); + GetToolBar()->GetSize(&tw, &th); if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) { // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS @@ -311,9 +375,23 @@ void wxFrame::PositionToolBar() } else { +#if !wxMAC_USE_NATIVE_TOOLBAR // Use the 'real' position GetToolBar()->SetSize(tx , ty , cw , th, wxSIZE_NO_ADJUSTMENTS ); +#endif } } } + +void wxFrame::PositionBars() +{ +#if wxUSE_STATUSBAR + PositionStatusBar(); +#endif +#if wxUSE_TOOLBAR + PositionToolBar(); +#endif +} + #endif +