X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7810c95b5de52447a5c2c8aaed06f287e02fc690..5c7b506103cfc078a821860766e31c47d595e07f:/src/mac/carbon/frame.cpp?ds=sidebyside diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index aded221ea5..b4da3e565f 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -1,36 +1,34 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: frame.cpp +// Name: src/mac/carbon/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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "frame.h" -#endif +#include "wx/wxprec.h" #include "wx/frame.h" -#include "wx/statusbr.h" -#include "wx/toolbar.h" -#include "wx/menuitem.h" -#include "wx/menu.h" -#include "wx/dcclient.h" -#include "wx/dialog.h" -#include "wx/settings.h" -#include "wx/app.h" -#include +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/dcclient.h" + #include "wx/menu.h" + #include "wx/dialog.h" + #include "wx/settings.h" + #include "wx/toolbar.h" + #include "wx/statusbr.h" + #include "wx/menuitem.h" +#endif // WX_PRECOMP + +#include "wx/mac/uma.h" -extern wxList wxModelessWindows; -extern wxList wxPendingDelete; +extern wxWindowList wxModelessWindows; -#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,52 +36,17 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) // EVT_CLOSE(wxFrame::OnCloseWindow) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) -#if wxUSE_NATIVE_STATUSBAR -bool wxFrame::m_useNativeStatusBar = TRUE; -#else -bool wxFrame::m_useNativeStatusBar = FALSE; -#endif +#define WX_MAC_STATUSBAR_HEIGHT 18 -#define WX_MAC_STATUSBAR_HEIGHT 15 // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- void wxFrame::Init() { - 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; + m_winLastFocused = NULL; } bool wxFrame::Create(wxWindow *parent, @@ -94,264 +57,288 @@ bool wxFrame::Create(wxWindow *parent, long style, const wxString& name) { - m_frameMenuBar = NULL; - -#if wxUSE_TOOLBAR - m_frameToolBar = NULL ; -#endif - m_frameStatusBar = NULL; - m_winLastFocused = NULL ; - - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); - - if ( id > -1 ) - m_windowId = id; - else - m_windowId = (int)NewControlId(); - if (parent) parent->AddChild(this); + if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) + return false; - if (!parent) - wxTopLevelWindows.Append(this); + wxModelessWindows.Append(this); - MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; - - m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ; - - wxModelessWindows.Append(this); - - return TRUE; + return true; } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; - wxTopLevelWindows.DeleteObject(this); - - DeleteAllBars(); - -/* Check if it's the last top-level window */ + m_isBeingDeleted = true; + DeleteAllBars(); +} - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) - { - wxTheApp->SetTopWindow(NULL); +// get the origin of the client area in the client coordinates +wxPoint wxFrame::GetClientAreaOrigin() const +{ + wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin(); - if (wxTheApp->GetExitOnFrameDelete()) +#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) + wxToolBar *toolbar = GetToolBar(); + if ( toolbar && toolbar->IsShown() ) { - wxTheApp->ExitMainLoop() ; + 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 - wxModelessWindows.DeleteObject(this); + return pt; } - 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 ) ; - } - } - - 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 -} + return false; -// Is the frame maximized? -bool wxFrame::IsMaximized(void) const -{ - // TODO - return FALSE; -} + if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() ) + { + int iMaxMenu = m_frameMenuBar->GetMenuCount(); + for ( int i = 0 ; i < iMaxMenu ; ++ i ) + { + m_frameMenuBar->EnableTop( i , enable ) ; + } + } -void wxFrame::Restore() -{ - // TODO -} - -void wxFrame::SetIcon(const wxIcon& icon) -{ - wxFrameBase::SetIcon(icon); + return true; } +#if wxUSE_STATUSBAR 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 , 15 ) ; + statusBar = new wxStatusBar(this, id, style, name); + statusBar->SetSize(100, WX_MAC_STATUSBAR_HEIGHT); 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); - } -} - -void wxFrame::SetMenuBar(wxMenuBar *menuBar) -{ - if (!menuBar) + if (m_frameStatusBar && m_frameStatusBar->IsShown() ) { - return; + 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); } - - m_frameMenuBar = NULL; - m_frameMenuBar = menuBar; -// m_frameMenuBar->MacInstallMenuBar() ; - m_frameMenuBar->Attach(this); } - +#endif // wxUSE_STATUSBAR // Responds to colour changes, and passes event on to children. void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); +#if wxUSE_STATUSBAR if ( m_frameStatusBar ) { wxSysColourChangedEvent event2; + event2.SetEventObject( m_frameStatusBar ); m_frameStatusBar->ProcessEvent(event2); } +#endif // wxUSE_STATUSBAR // Propagate the event to the non-top-level children wxWindow::OnSysColourChanged(event); } - // Default activation behaviour - set the focus for the first child // subwindow found. 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() ) + else { - // 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 to the child which was last focused + wxWindow *parent = m_winLastFocused + ? m_winLastFocused->GetParent() + : NULL; - // restore focus - wxWindow *child = node->GetData(); + if (parent == NULL) + parent = this; - if ( !child->IsTopLevel() && child->AcceptsFocus() -#if wxUSE_TOOLBAR - && !wxDynamicCast(child, wxToolBar) -#endif // wxUSE_TOOLBAR -#if wxUSE_STATUSBAR - && !wxDynamicCast(child, wxStatusBar) -#endif // wxUSE_STATUSBAR - ) + wxSetFocusToChild(parent, &m_winLastFocused); + + if (m_frameMenuBar != NULL) + { + m_frameMenuBar->MacInstallMenuBar(); + } + else { - child->SetFocus(); - break; + wxFrame *tlf = wxDynamicCast( wxTheApp->GetTopWindow(), wxFrame ); + if (tlf != NULL) + { + // Trying top-level frame membar + if (tlf->GetMenuBar()) + tlf->GetMenuBar()->MacInstallMenuBar(); + } } } - */ - wxSetFocusToChild(this, &m_winLastFocused); - - if ( m_frameMenuBar != NULL ) - { - m_frameMenuBar->MacInstallMenuBar() ; - } - } +} + +void wxFrame::DetachMenuBar() +{ + if ( m_frameMenuBar ) + m_frameMenuBar->UnsetInvokingWindow(); + + wxFrameBase::DetachMenuBar(); +} + +void wxFrame::AttachMenuBar( wxMenuBar *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 { - wxWindow::DoGetClientSize( x , y ) ; + wxTopLevelWindow::DoGetClientSize( x , y ); #if wxUSE_STATUSBAR - if ( GetStatusBar() ) - { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - *y -= statusY; - } -#endif // wxUSE_STATUSBAR + if ( GetStatusBar() && GetStatusBar()->IsShown() && y ) + *y -= WX_MAC_STATUSBAR_HEIGHT; +#endif - wxPoint pt(GetClientAreaOrigin()); - *y -= pt.y; - *x -= pt.x; +#if wxUSE_TOOLBAR + wxToolBar *toolbar = GetToolBar(); + if ( toolbar && toolbar->IsShown() ) + { + int w, h; + toolbar->GetSize(&w, &h); + + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) + { + if ( x ) + *x -= w; + } + else + { +#if !wxMAC_USE_NATIVE_TOOLBAR + if ( y ) + *y -= h; +#endif + } + } +#endif } -void wxFrame::DoSetClientSize(int clientwidth, int clientheight) +bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const { - int currentclientwidth , currentclientheight ; - int currentwidth , currentheight ; - - GetClientSize( ¤tclientwidth , ¤tclientheight ) ; - 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 ) ; +#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 + 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; } @@ -360,33 +347,60 @@ void wxFrame::PositionToolBar() { int cw, ch; - cw = m_width ; - ch = m_height ; + GetSize( &cw , &ch ) ; + + int statusX = 0 ; + int statusY = 0 ; - if ( GetStatusBar() ) +#if wxUSE_STATUSBAR + if (GetStatusBar() && GetStatusBar()->IsShown()) { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - ch -= statusY; + GetStatusBar()->GetClientSize(&statusX, &statusY); + ch -= statusY; } +#endif if (GetToolBar()) { - int tw, th; - GetToolBar()->GetSize(& 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 if (GetToolBar()->GetWindowStyleFlag() & wxTB_BOTTOM) + { + //FIXME: this positions the tool bar almost correctly, but still it doesn't work right yet, + //as 1) the space for the 'old' top toolbar is still taken up, and 2) the toolbar + //doesn't extend it's width to the width of the frame. + tx = 0; + ty = ch - (th + statusY); + GetToolBar()->SetSize(tx, ty, cw, th, wxSIZE_NO_ADJUSTMENTS ); } else { +#if !wxMAC_USE_NATIVE_TOOLBAR // 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 ); +#endif } } } +#endif // wxUSE_TOOLBAR + +void wxFrame::PositionBars() +{ +#if wxUSE_STATUSBAR + PositionStatusBar(); #endif +#if wxUSE_TOOLBAR + PositionToolBar(); +#endif +} + +