AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cleanup - reformat

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell 2006-01-03 04:36:25 +00:00
parent 2ad97616eb
commit 7ad25aed02
1 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/mac/carbon/frame.cpp
View File

@ -37,6 +37,7 @@ END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
#define WX_MAC_STATUSBAR_HEIGHT 18 #define WX_MAC_STATUSBAR_HEIGHT 18
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// creation/destruction // creation/destruction
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -44,18 +45,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
void wxFrame::Init() void wxFrame::Init()
{ {
m_frameMenuBar = NULL; m_frameMenuBar = NULL;
m_frameStatusBar = NULL;
m_winLastFocused = NULL;
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
m_frameToolBar = NULL ; m_frameToolBar = NULL;
#endif #endif
m_frameStatusBar = NULL;
m_winLastFocused = NULL ;
m_iconized = false;
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
m_hwndToolTip = 0; // NB: is this used anywhere?
m_hwndToolTip = NULL;
#endif #endif
m_iconized = false;
} }
bool wxFrame::Create(wxWindow *parent, bool wxFrame::Create(wxWindow *parent,
@ -85,14 +87,14 @@ wxFrame::~wxFrame()
wxPoint wxFrame::GetClientAreaOrigin() const wxPoint wxFrame::GetClientAreaOrigin() const
{ {
wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin(); wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) #if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
wxToolBar *toolbar = GetToolBar(); wxToolBar *toolbar = GetToolBar();
if ( toolbar && toolbar->IsShown() ) if ( toolbar && toolbar->IsShown() )
{ {
int w, h; int w, h;
toolbar->GetSize(&w, &h); toolbar->GetSize(&w, &h);
if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
{ {
pt.x += w; pt.x += w;
@ -104,7 +106,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
#endif #endif
} }
} }
#endif // wxUSE_TOOLBAR #endif
return pt; return pt;
} }
@ -116,7 +118,7 @@ bool wxFrame::Enable(bool enable)
if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() ) if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
{ {
int iMaxMenu = m_frameMenuBar->GetMenuCount(); int iMaxMenu = m_frameMenuBar->GetMenuCount();
for ( int i = 0 ; i < iMaxMenu ; ++ i ) for ( int i = 0 ; i < iMaxMenu ; ++ i )
{ {
m_frameMenuBar->EnableTop( i , enable ) ; m_frameMenuBar->EnableTop( i , enable ) ;
@ -129,12 +131,12 @@ bool wxFrame::Enable(bool enable)
wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
const wxString& name) const wxString& name)
{ {
wxStatusBar *statusBar = NULL; wxStatusBar *statusBar;
statusBar = new wxStatusBar(this, id, statusBar = new wxStatusBar(this, id, style, name);
style, name); statusBar->SetSize(100 , WX_MAC_STATUSBAR_HEIGHT);
statusBar->SetSize( 100 , WX_MAC_STATUSBAR_HEIGHT ) ;
statusBar->SetFieldsCount(number); statusBar->SetFieldsCount(number);
return statusBar; return statusBar;
} }
@ -160,6 +162,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
if ( m_frameStatusBar ) if ( m_frameStatusBar )
{ {
wxSysColourChangedEvent event2; wxSysColourChangedEvent event2;
event2.SetEventObject( m_frameStatusBar ); event2.SetEventObject( m_frameStatusBar );
m_frameStatusBar->ProcessEvent(event2); m_frameStatusBar->ProcessEvent(event2);
} }
@ -168,7 +171,6 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
wxWindow::OnSysColourChanged(event); wxWindow::OnSysColourChanged(event);
} }
// Default activation behaviour - set the focus for the first child // Default activation behaviour - set the focus for the first child
// subwindow found. // subwindow found.
void wxFrame::OnActivate(wxActivateEvent& event) void wxFrame::OnActivate(wxActivateEvent& event)
@ -185,9 +187,7 @@ void wxFrame::OnActivate(wxActivateEvent& event)
if ( win->IsTopLevel() ) if ( win->IsTopLevel() )
{ {
if ( win != this ) if ( win != this )
{
m_winLastFocused = NULL; m_winLastFocused = NULL;
}
break; break;
} }
@ -200,23 +200,23 @@ void wxFrame::OnActivate(wxActivateEvent& event)
else else
{ {
// restore focus to the child which was last focused // restore focus to the child which was last focused
wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() wxWindow *parent = m_winLastFocused
: NULL; ? m_winLastFocused->GetParent()
: NULL;
if ( !parent ) if ( !parent )
{
parent = this; parent = this;
}
wxSetFocusToChild(parent, &m_winLastFocused); wxSetFocusToChild(parent, &m_winLastFocused);
if ( m_frameMenuBar != NULL ) if (m_frameMenuBar != NULL)
{ {
m_frameMenuBar->MacInstallMenuBar() ; m_frameMenuBar->MacInstallMenuBar() ;
} }
else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame))) else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)))
{ {
// Trying toplevel frame menbar // Trying toplevel frame membar
if( ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar() ) if (((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar())
((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar(); ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar();
} }
} }
@ -225,9 +225,7 @@ void wxFrame::OnActivate(wxActivateEvent& event)
void wxFrame::DetachMenuBar() void wxFrame::DetachMenuBar()
{ {
if ( m_frameMenuBar ) if ( m_frameMenuBar )
{
m_frameMenuBar->UnsetInvokingWindow(); m_frameMenuBar->UnsetInvokingWindow();
}
wxFrameBase::DetachMenuBar(); wxFrameBase::DetachMenuBar();
} }
@ -237,21 +235,17 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
wxFrameBase::AttachMenuBar(menuBar); wxFrameBase::AttachMenuBar(menuBar);
if (m_frameMenuBar) if (m_frameMenuBar)
{
m_frameMenuBar->SetInvokingWindow( this ); m_frameMenuBar->SetInvokingWindow( this );
}
} }
void wxFrame::DoGetClientSize(int *x, int *y) const void wxFrame::DoGetClientSize(int *x, int *y) const
{ {
wxTopLevelWindow::DoGetClientSize( x , y ) ; wxTopLevelWindow::DoGetClientSize( x , y );
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
if ( GetStatusBar() && GetStatusBar()->IsShown() && y ) if ( GetStatusBar() && GetStatusBar()->IsShown() && y )
{
*y -= WX_MAC_STATUSBAR_HEIGHT; *y -= WX_MAC_STATUSBAR_HEIGHT;
} #endif
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
wxToolBar *toolbar = GetToolBar(); wxToolBar *toolbar = GetToolBar();
@ -262,16 +256,18 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
{ {
if ( x ) *x -= w; if ( x )
*x -= w;
} }
else else
{ {
#if !wxMAC_USE_NATIVE_TOOLBAR #if !wxMAC_USE_NATIVE_TOOLBAR
if ( y ) *y -= h; if ( y )
*y -= h;
#endif #endif
} }
} }
#endif // wxUSE_TOOLBAR #endif
} }
bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const
@ -279,12 +275,12 @@ bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
if ( child == GetStatusBar() ) if ( child == GetStatusBar() )
return false ; return false ;
#endif // wxUSE_STATUSBAR #endif
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
if ( child == GetToolBar() ) if ( child == GetToolBar() )
return false ; return false ;
#endif // wxUSE_TOOLBAR #endif
return wxFrameBase::MacIsChildOfClientArea( child ) ; return wxFrameBase::MacIsChildOfClientArea( child ) ;
} }
@ -303,15 +299,12 @@ void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
// find the current client size // find the current client size
// Find the difference between the entire window (title bar and all) // Find the difference between the entire window (title bar and all) and
// and the client area; add this to the new client size to move the // the client area; add this to the new client size to move the window
// window
DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth , DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ; currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
} }
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
void wxFrame::SetToolBar(wxToolBar *toolbar) void wxFrame::SetToolBar(wxToolBar *toolbar)
{ {
@ -320,10 +313,11 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
#if wxMAC_USE_NATIVE_TOOLBAR #if wxMAC_USE_NATIVE_TOOLBAR
if ( m_frameToolBar ) if ( m_frameToolBar )
m_frameToolBar->MacInstallNativeToolbar(false) ; m_frameToolBar->MacInstallNativeToolbar( false ) ;
#endif #endif
m_frameToolBar = toolbar ; m_frameToolBar = toolbar ;
#if wxMAC_USE_NATIVE_TOOLBAR #if wxMAC_USE_NATIVE_TOOLBAR
if ( toolbar ) if ( toolbar )
toolbar->MacInstallNativeToolbar( true ) ; toolbar->MacInstallNativeToolbar( true ) ;
@ -333,9 +327,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{ {
if ( wxFrameBase::CreateToolBar(style, id, name) ) if ( wxFrameBase::CreateToolBar(style, id, name) )
{
PositionToolBar(); PositionToolBar();
}
return m_frameToolBar; return m_frameToolBar;
} }
@ -346,19 +338,20 @@ void wxFrame::PositionToolBar()
GetSize( &cw , &ch ) ; GetSize( &cw , &ch ) ;
if ( GetStatusBar() && GetStatusBar()->IsShown()) if (GetStatusBar() && GetStatusBar()->IsShown())
{ {
int statusX, statusY; int statusX, statusY;
GetStatusBar()->GetClientSize(&statusX, &statusY);
ch -= statusY; GetStatusBar()->GetClientSize(&statusX, &statusY);
ch -= statusY;
} }
if (GetToolBar()) if (GetToolBar())
{ {
int tx, ty, tw, th; int tx, ty, tw, th;
tx = ty = 0 ;
GetToolBar()->GetSize(& tw, & th); tx = ty = 0 ;
GetToolBar()->GetSize(&tw, &th);
if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
{ {
// Use the 'real' position. wxSIZE_NO_ADJUSTMENTS // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
@ -376,3 +369,4 @@ void wxFrame::PositionToolBar()
} }
} }
#endif #endif