// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "frame.h"
-#endif
+#include "wx/wxprec.h"
#include "wx/frame.h"
#include "wx/statusbr.h"
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)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-#endif
-#define WX_MAC_STATUSBAR_HEIGHT 15
+#define WX_MAC_STATUSBAR_HEIGHT 18
// ----------------------------------------------------------------------------
// creation/destruction
// ----------------------------------------------------------------------------
void wxFrame::Init()
{
m_frameMenuBar = NULL;
-
+
#if wxUSE_TOOLBAR
m_frameToolBar = NULL ;
#endif
m_frameStatusBar = NULL;
m_winLastFocused = NULL ;
-
- m_iconized = FALSE;
-
+
+ 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,
long style,
const wxString& name)
{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
-
- if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
- return FALSE;
-
- MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
- m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
- SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
+ if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+ 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 // wxUSE_TOOLBAR
+
+ 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,
statusBar = new wxStatusBar(this, id,
style, name);
- statusBar->SetSize( 100 , 15 ) ;
+ statusBar->SetSize( 100 , WX_MAC_STATUSBAR_HEIGHT ) ;
statusBar->SetFieldsCount(number);
return statusBar;
}
void wxFrame::PositionStatusBar()
{
- if (m_frameStatusBar )
+ if (m_frameStatusBar && m_frameStatusBar->IsShown() )
{
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);
+ m_frameStatusBar->SetSize(0, h, w, WX_MAC_STATUSBAR_HEIGHT);
}
}
void wxFrame::DoGetClientSize(int *x, int *y) const
{
- wxWindow::DoGetClientSize( x , y ) ;
-
+ wxTopLevelWindow::DoGetClientSize( x , y ) ;
+
#if wxUSE_STATUSBAR
- if ( GetStatusBar() && y )
+ if ( GetStatusBar() && GetStatusBar()->IsShown() && y )
{
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- *y -= statusY;
+ *y -= WX_MAC_STATUSBAR_HEIGHT;
}
#endif // wxUSE_STATUSBAR
-
- wxPoint pt(GetClientAreaOrigin());
- if ( y )
- *y -= pt.y;
- if ( x )
- *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 // wxUSE_TOOLBAR
+}
+
+bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const
+{
+#if wxUSE_STATUSBAR
+ if ( child == GetStatusBar() )
+ return false ;
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+ if ( child == GetToolBar() )
+ return false ;
+#endif // wxUSE_TOOLBAR
+
+ 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)
#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) )
{
int cw, ch;
- cw = m_width ;
- ch = m_height ;
+ GetSize( &cw , &ch ) ;
- if ( GetStatusBar() )
+ if ( GetStatusBar() && GetStatusBar()->IsShown())
{
int statusX, statusY;
GetStatusBar()->GetClientSize(&statusX, &statusY);
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 !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
}
}
}
projects / wxWidgets.git / blobdiff