X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a756f210019dd5b51331b7181c816d3882146a30..5fc01d1326a34223746546326a7f616df8bfa991:/src/mac/carbon/frame.cpp diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index 990ba1a514..4fba75bad2 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: frame.cpp // Purpose: wxFrame -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -40,12 +40,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) #endif -#if wxUSE_NATIVE_STATUSBAR -bool wxFrame::m_useNativeStatusBar = TRUE; -#else -bool wxFrame::m_useNativeStatusBar = FALSE; -#endif - #define WX_MAC_STATUSBAR_HEIGHT 15 // ---------------------------------------------------------------------------- // creation/destruction @@ -53,46 +47,21 @@ bool wxFrame::m_useNativeStatusBar = FALSE; void wxFrame::Init() { - m_frameMenuBar = NULL; - + m_frameMenuBar = NULL; + #if wxUSE_TOOLBAR - m_frameToolBar = NULL ; + m_frameToolBar = NULL ; #endif - m_frameStatusBar = NULL; - m_winLastFocused = NULL ; - + m_frameStatusBar = NULL; + m_winLastFocused = NULL ; + m_iconized = FALSE; - + #if wxUSE_TOOLTIPS m_hwndToolTip = 0; #endif } -wxPoint wxFrame::GetClientAreaOrigin() const -{ - // on mac we are at position -1,-1 with the control - wxPoint pt(0, 0); - -#if wxUSE_TOOLBAR - if ( GetToolBar() ) - { - int w, h; - GetToolBar()->GetSize(& w, & h); - - if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) - { - pt.x += w - 1; - } - else - { - pt.y += h - 1 ; - } - } -#endif // wxUSE_TOOLBAR - - return pt; -} - bool wxFrame::Create(wxWindow *parent, wxWindowID id, const wxString& title, @@ -101,26 +70,21 @@ bool wxFrame::Create(wxWindow *parent, long style, const wxString& name) { - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - + if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) return FALSE; + + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; - - m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ; - - wxModelessWindows.Append(this); - - return TRUE; + wxModelessWindows.Append(this); + + return TRUE; } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; - - DeleteAllBars(); - + m_isBeingDeleted = TRUE; + DeleteAllBars(); } @@ -129,13 +93,14 @@ bool wxFrame::Enable(bool enable) if ( !wxWindow::Enable(enable) ) return FALSE; - if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() ) - { - for ( int i = 0 ; i < m_frameMenuBar->GetMenuCount() ; ++ i ) - { - m_frameMenuBar->EnableTop( i , enable ) ; - } - } + if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() ) + { + int iMaxMenu = m_frameMenuBar->GetMenuCount(); + for ( int i = 0 ; i < iMaxMenu ; ++ i ) + { + m_frameMenuBar->EnableTop( i , enable ) ; + } + } return TRUE; } @@ -147,24 +112,24 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, statusBar = new wxStatusBar(this, id, style, name); - statusBar->SetSize( 100 , 15 ) ; + statusBar->SetSize( 100 , 15 ) ; statusBar->SetFieldsCount(number); return statusBar; } void wxFrame::PositionStatusBar() { - if (m_frameStatusBar ) - { - int w, h; - GetClientSize(&w, &h); - int sw, sh; - m_frameStatusBar->GetSize(&sw, &sh); - - // 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, sh); - } + if (m_frameStatusBar ) + { + int w, h; + GetClientSize(&w, &h); + int sw, sh; + m_frameStatusBar->GetSize(&sw, &sh); + + // 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, sh); + } } // Responds to colour changes, and passes event on to children. @@ -213,8 +178,8 @@ void wxFrame::OnActivate(wxActivateEvent& event) event.Skip(); } - else - { + else + { // restore focus to the child which was last focused wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() : NULL; @@ -223,51 +188,93 @@ void wxFrame::OnActivate(wxActivateEvent& event) parent = this; } - wxSetFocusToChild(parent, &m_winLastFocused); + wxSetFocusToChild(parent, &m_winLastFocused); - if ( m_frameMenuBar != NULL ) - { - m_frameMenuBar->MacInstallMenuBar() ; - } - } + 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() ) + ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar(); + } + } } -void wxFrame::DoGetClientSize(int *x, int *y) const +void wxFrame::DetachMenuBar() { - wxWindow::DoGetClientSize( x , y ) ; + if ( m_frameMenuBar ) + { + m_frameMenuBar->UnsetInvokingWindow(); + } + + wxFrameBase::DetachMenuBar(); +} + +void wxFrame::AttachMenuBar( wxMenuBar *menuBar ) +{ + wxFrameBase::AttachMenuBar(menuBar); + if (m_frameMenuBar) + { + m_frameMenuBar->SetInvokingWindow( this ); + } +} + +void wxFrame::DoGetClientSize(int *x, int *y) const +{ + wxTopLevelWindow::DoGetClientSize( x , y ) ; + #if wxUSE_STATUSBAR - if ( GetStatusBar() && y ) - { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - *y -= statusY; - } + if ( GetStatusBar() && y ) + { + int statusX, statusY; + GetStatusBar()->GetSize(&statusX, &statusY); + if ( y) *y -= statusY; + } #endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR + wxToolBar *toolbar = GetToolBar(); + if ( toolbar && toolbar->IsShown() ) + { + int w, h; + toolbar->GetSize(&w, &h); - wxPoint pt(GetClientAreaOrigin()); - if ( y ) - *y -= pt.y; - if ( x ) - *x -= pt.x; + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) + { + if ( x ) *x -= w; + } + else + { + if ( y ) *y -= h; + } + } +#endif // wxUSE_TOOLBAR } void wxFrame::DoSetClientSize(int clientwidth, int clientheight) { - int currentclientwidth , currentclientheight ; - int currentwidth , currentheight ; - - GetClientSize( ¤tclientwidth , ¤tclientheight ) ; - GetSize( ¤twidth , ¤theight ) ; - - // find the current client size + 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 - DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth , - currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ; + DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth , + currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ; } @@ -286,8 +293,7 @@ void wxFrame::PositionToolBar() { int cw, ch; - cw = m_width ; - ch = m_height ; + GetSize( &cw , &ch ) ; if ( GetStatusBar() ) { @@ -298,20 +304,21 @@ void wxFrame::PositionToolBar() if (GetToolBar()) { - int tw, th; + int tx, ty, tw, th; + tx = ty = 0 ; + GetToolBar()->GetSize(& tw, & th); - if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) { // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS // means, pretend we don't have toolbar/status bar, so we // have the original client size. - GetToolBar()->SetSize(-1, -1, tw, ch + 2 , wxSIZE_NO_ADJUSTMENTS | wxSIZE_ALLOW_MINUS_ONE ); + GetToolBar()->SetSize(tx , ty , tw, ch , wxSIZE_NO_ADJUSTMENTS ); } else { // Use the 'real' position - GetToolBar()->SetSize(-1, -1, cw + 2, th, wxSIZE_NO_ADJUSTMENTS | wxSIZE_ALLOW_MINUS_ONE ); + GetToolBar()->SetSize(tx , ty , cw , th, wxSIZE_NO_ADJUSTMENTS ); } } }