/////////////////////////////////////////////////////////////////////////////
-// Name: frame.cpp
-// Purpose: wxFrameMac
-// Author: AUTHOR
+// Name: src/mac/carbon/frame.cpp
+// Purpose: wxFrame
+// 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 <wx/mac/uma.h>
+#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 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)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-#if wxUSE_NATIVE_STATUSBAR
-bool wxFrameMac::m_useNativeStatusBar = TRUE;
-#else
-bool wxFrameMac::m_useNativeStatusBar = FALSE;
-#endif
+#define WX_MAC_STATUSBAR_HEIGHT 18
-#define WX_MAC_STATUSBAR_HEIGHT 15
// ----------------------------------------------------------------------------
// creation/destruction
// ----------------------------------------------------------------------------
-void wxFrameMac::Init()
+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
- m_hwndToolTip = 0;
-#endif
+ m_winLastFocused = NULL;
}
-wxPoint wxFrameMac::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 wxFrameMac::Create(wxWindow *parent,
+bool wxFrame::Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos,
long style,
const wxString& name)
{
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
- if ( id > -1 )
- m_windowId = id;
- else
- m_windowId = (int)NewControlId();
+ if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+ return false;
- if (parent) parent->AddChild(this);
+ wxModelessWindows.Append(this);
- if (!parent)
- wxTopLevelWindows.Append(this);
-
- MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
-
- m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
-
- wxModelessWindows.Append(this);
-
- return TRUE;
+ return true;
}
-wxFrameMac::~wxFrameMac()
+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 wxFrameMac::Enable(bool enable)
+bool wxFrame::Enable(bool enable)
{
if ( !wxWindow::Enable(enable) )
- return FALSE;
+ 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;
+ return true;
}
-wxStatusBar *wxFrameMac::OnCreateStatusBar(int number, long style, wxWindowID id,
+#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 wxFrameMac::PositionStatusBar()
+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 && m_frameStatusBar->IsShown() )
+ {
+ 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);
+ }
}
+#endif // wxUSE_STATUSBAR
// 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));
+ 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 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() )
+ 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)
{
- child->SetFocus();
- break;
+ m_frameMenuBar->MacInstallMenuBar();
+ }
+ else
+ {
+ 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 wxFrameMac::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 )
+{
+ 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 );
#if wxUSE_STATUSBAR
- if ( GetStatusBar() && y )
- {
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- *y -= statusY;
- }
-#endif // wxUSE_STATUSBAR
+ if ( GetStatusBar() && GetStatusBar()->IsShown() && y )
+ *y -= WX_MAC_STATUSBAR_HEIGHT;
+#endif
+
+#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 !wxMAC_USE_NATIVE_TOOLBAR
+ if ( y )
+ *y -= h;
+#endif
+ }
+ }
+#endif
}
-void wxFrameMac::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
-wxToolBar* wxFrameMac::CreateToolBar(long style, wxWindowID id, const wxString& name)
+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;
}
-void wxFrameMac::PositionToolBar()
+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
+}
+
+
projects / wxWidgets.git / blobdiff