// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "frame.h"
-#endif
-
#include "wx/wxprec.h"
#include "wx/frame.h"
#include "wx/mac/uma.h"
extern wxWindowList wxModelessWindows;
-extern wxList wxPendingDelete;
+//extern wxList wxPendingDelete;
BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
EVT_ACTIVATE(wxFrame::OnActivate)
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
#define WX_MAC_STATUSBAR_HEIGHT 18
+
// ----------------------------------------------------------------------------
// creation/destruction
// ----------------------------------------------------------------------------
void wxFrame::Init()
{
m_frameMenuBar = NULL;
+ m_frameStatusBar = NULL;
+ m_winLastFocused = NULL;
#if wxUSE_TOOLBAR
- m_frameToolBar = NULL ;
+ m_frameToolBar = NULL;
#endif
- m_frameStatusBar = NULL;
- m_winLastFocused = NULL ;
-
- m_iconized = false;
#if wxUSE_TOOLTIPS
- m_hwndToolTip = 0;
+ // NB: is this used anywhere?
+ m_hwndToolTip = NULL;
#endif
+
+ m_iconized = false;
}
bool wxFrame::Create(wxWindow *parent,
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;
#endif
}
}
-#endif // wxUSE_TOOLBAR
-
+#endif
+
return pt;
}
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 ) ;
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 , WX_MAC_STATUSBAR_HEIGHT ) ;
+ statusBar = new wxStatusBar(this, id, style, name);
+ statusBar->SetSize(100, WX_MAC_STATUSBAR_HEIGHT);
statusBar->SetFieldsCount(number);
+
return statusBar;
}
if ( m_frameStatusBar )
{
wxSysColourChangedEvent event2;
+
event2.SetEventObject( m_frameStatusBar );
m_frameStatusBar->ProcessEvent(event2);
}
wxWindow::OnSysColourChanged(event);
}
-
// Default activation behaviour - set the focus for the first child
// subwindow found.
void wxFrame::OnActivate(wxActivateEvent& event)
if ( win->IsTopLevel() )
{
if ( win != this )
- {
m_winLastFocused = NULL;
- }
break;
}
else
{
// restore focus to the child which was last focused
- wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
- : NULL;
- if ( !parent )
- {
+ wxWindow *parent = m_winLastFocused
+ ? m_winLastFocused->GetParent()
+ : NULL;
+
+ if (parent == NULL)
parent = this;
- }
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
{
- // Trying toplevel frame menbar
- if( ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar() )
- ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar();
- }
+ wxFrame *tlf = wxDynamicCast( wxTheApp->GetTopWindow(), wxFrame );
+ if (tlf != NULL)
+ {
+ // Trying top-level frame membar
+ if (tlf->GetMenuBar())
+ tlf->GetMenuBar()->MacInstallMenuBar();
+ }
+ }
}
}
void wxFrame::DetachMenuBar()
{
if ( m_frameMenuBar )
- {
m_frameMenuBar->UnsetInvokingWindow();
- }
wxFrameBase::DetachMenuBar();
}
void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
{
- wxFrameBase::AttachMenuBar(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 ) ;
+ wxTopLevelWindow::DoGetClientSize( x , y );
#if wxUSE_STATUSBAR
if ( GetStatusBar() && GetStatusBar()->IsShown() && y )
- {
*y -= WX_MAC_STATUSBAR_HEIGHT;
- }
-#endif // wxUSE_STATUSBAR
+#endif
#if wxUSE_TOOLBAR
wxToolBar *toolbar = GetToolBar();
if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
{
- if ( x ) *x -= w;
+ if ( x )
+ *x -= w;
}
else
{
-//#if wxMAC_USE_NATIVE_TOOLBAR
- // todo verify whether HIToolBox is giving correct sizes here for the tlw
- if ( y ) *y -= h;
-//#endif
+#if !wxMAC_USE_NATIVE_TOOLBAR
+ if ( y )
+ *y -= h;
+#endif
}
}
-#endif // wxUSE_TOOLBAR
+#endif
}
bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const
#if wxUSE_STATUSBAR
if ( child == GetStatusBar() )
return false ;
-#endif // wxUSE_STATUSBAR
+#endif
#if wxUSE_TOOLBAR
if ( child == GetToolBar() )
return false ;
-#endif // wxUSE_TOOLBAR
+#endif
return wxFrameBase::MacIsChildOfClientArea( child ) ;
}
// 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
-
+ // 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) ;
+ m_frameToolBar->MacInstallNativeToolbar( false ) ;
#endif
-
+
m_frameToolBar = toolbar ;
+
#if wxMAC_USE_NATIVE_TOOLBAR
if ( toolbar )
toolbar->MacInstallNativeToolbar( true ) ;
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
if ( wxFrameBase::CreateToolBar(style, id, name) )
- {
PositionToolBar();
- }
return m_frameToolBar;
}
GetSize( &cw , &ch ) ;
- if ( GetStatusBar() && GetStatusBar()->IsShown())
+ if (GetStatusBar() && GetStatusBar()->IsShown())
{
- int statusX, statusY;
- GetStatusBar()->GetClientSize(&statusX, &statusY);
- ch -= statusY;
+ int statusX, statusY;
+
+ GetStatusBar()->GetClientSize(&statusX, &statusY);
+ ch -= statusY;
}
if (GetToolBar())
{
int tx, ty, tw, th;
- tx = ty = 0 ;
- GetToolBar()->GetSize(& tw, & th);
+ tx = ty = 0 ;
+ GetToolBar()->GetSize(&tw, &th);
if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
{
// Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
}
}
}
+
+void wxFrame::PositionBars()
+{
+#if wxUSE_STATUSBAR
+ PositionStatusBar();
#endif
+#if wxUSE_TOOLBAR
+ PositionToolBar();
+#endif
+}
+
+#endif
+
projects / wxWidgets.git / blobdiff