/////////////////////////////////////////////////////////////////////////////
// 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
/////////////////////////////////////////////////////////////////////////////
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
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,
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 ) ;
-
- wxModelessWindows.Append(this);
-
- return TRUE;
+
+ wxModelessWindows.Append(this);
+
+ return TRUE;
}
wxFrame::~wxFrame()
{
- m_isBeingDeleted = TRUE;
-
- DeleteAllBars();
-
+ m_isBeingDeleted = TRUE;
+ DeleteAllBars();
}
if ( !wxWindow::Enable(enable) )
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 ) ;
- }
- }
+ 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;
}
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 )
- {
- 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);
+
+ // 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);
+ }
}
// Responds to colour changes, and passes event on to children.
event.Skip();
}
- else
- {
+ else
+ {
// restore focus to the child which was last focused
wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
: NULL;
parent = this;
}
- wxSetFocusToChild(parent, &m_winLastFocused);
+ wxSetFocusToChild(parent, &m_winLastFocused);
- if ( m_frameMenuBar != NULL )
- {
- m_frameMenuBar->MacInstallMenuBar() ;
- }
- else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)))
+ 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();
- }
- }
+ ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar();
+ }
+ }
}
void wxFrame::DetachMenuBar()
void wxFrame::DoGetClientSize(int *x, int *y) const
{
- wxWindow::DoGetClientSize( x , y ) ;
-
+ wxTopLevelWindow::DoGetClientSize( x , y ) ;
+
#if wxUSE_STATUSBAR
- if ( GetStatusBar() && y )
- {
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- *y -= statusY;
- }
+ if ( GetStatusBar() && y )
+ {
+ if ( y) *y -= WX_MAC_STATUSBAR_HEIGHT;
+ }
#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 ) ;
}
{
int cw, ch;
- cw = m_width ;
- ch = m_height ;
+ GetSize( &cw , &ch ) ;
if ( GetStatusBar() )
{
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 );
}
}
}
projects / wxWidgets.git / blobdiff