/////////////////////////////////////////////////////////////////////////////
// Name: frame.cpp
-// Purpose: wxFrame
+// Purpose: wxFrameMac
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
#endif
#include "wx/frame.h"
-#include "wx/mac/statusbr.h"
+#include "wx/statusbr.h"
#include "wx/toolbar.h"
#include "wx/menuitem.h"
#include "wx/menu.h"
extern wxList wxPendingDelete;
#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
-// EVT_SIZE(wxFrame::OnSize)
- EVT_ACTIVATE(wxFrame::OnActivate)
- // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
- EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-// EVT_IDLE(wxFrame::OnIdle)
-// EVT_CLOSE(wxFrame::OnCloseWindow)
+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)
END_EVENT_TABLE()
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrameMac, wxWindow)
+#endif
+#ifndef __WXUNIVERSAL__
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMac)
#endif
#if wxUSE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
+bool wxFrameMac::m_useNativeStatusBar = TRUE;
#else
-bool wxFrame::m_useNativeStatusBar = FALSE;
+bool wxFrameMac::m_useNativeStatusBar = FALSE;
#endif
#define WX_MAC_STATUSBAR_HEIGHT 15
// creation/destruction
// ----------------------------------------------------------------------------
-void wxFrame::Init()
+void wxFrameMac::Init()
{
+ m_frameMenuBar = NULL;
+
+#if wxUSE_TOOLBAR
+ m_frameToolBar = NULL ;
+#endif
+ m_frameStatusBar = NULL;
+ m_winLastFocused = NULL ;
+
m_iconized = FALSE;
#if wxUSE_TOOLTIPS
#endif
}
-wxPoint wxFrame::GetClientAreaOrigin() const
+wxPoint wxFrameMac::GetClientAreaOrigin() const
{
// on mac we are at position -1,-1 with the control
wxPoint pt(0, 0);
return pt;
}
-bool wxFrame::Create(wxWindow *parent,
+bool wxFrameMac::Create(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos,
long style,
const wxString& name)
{
- m_frameMenuBar = NULL;
-
-#if wxUSE_TOOLBAR
- m_frameToolBar = NULL ;
-#endif
- m_frameStatusBar = NULL;
-
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
if ( id > -1 )
return TRUE;
}
-wxFrame::~wxFrame()
+wxFrameMac::~wxFrameMac()
{
m_isBeingDeleted = TRUE;
wxTopLevelWindows.DeleteObject(this);
}
-bool wxFrame::Enable(bool enable)
+bool wxFrameMac::Enable(bool enable)
{
if ( !wxWindow::Enable(enable) )
return FALSE;
return TRUE;
}
// Equivalent to maximize/restore in Windows
-void wxFrame::Maximize(bool maximize)
+void wxFrameMac::Maximize(bool maximize)
{
// TODO
}
-bool wxFrame::IsIconized() const
+bool wxFrameMac::IsIconized() const
{
// TODO
return FALSE;
}
-void wxFrame::Iconize(bool iconize)
+void wxFrameMac::Iconize(bool iconize)
{
// TODO
}
// Is the frame maximized?
-bool wxFrame::IsMaximized(void) const
+bool wxFrameMac::IsMaximized(void) const
{
// TODO
return FALSE;
}
-void wxFrame::Restore()
+void wxFrameMac::Restore()
{
// TODO
}
-void wxFrame::SetIcon(const wxIcon& icon)
+void wxFrameMac::SetIcon(const wxIcon& icon)
{
wxFrameBase::SetIcon(icon);
}
-wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
+wxStatusBar *wxFrameMac::OnCreateStatusBar(int number, long style, wxWindowID id,
const wxString& name)
{
wxStatusBar *statusBar = NULL;
- statusBar = new wxStatusBar(this, id, style, name);
-
+ statusBar = new wxStatusBar(this, id,
+ style, name);
+ statusBar->SetSize( 100 , 15 ) ;
statusBar->SetFieldsCount(number);
return statusBar;
}
-void wxFrame::PositionStatusBar()
+void wxFrameMac::PositionStatusBar()
{
if (m_frameStatusBar )
{
// 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 );
+ m_frameStatusBar->SetSize(0, h, w, sh);
}
}
-void wxFrame::SetMenuBar(wxMenuBar *menuBar)
+void wxFrameMac::SetMenuBar(wxMenuBar *menuBar)
{
if (!menuBar)
{
return;
}
- m_frameMenuBar = NULL;
m_frameMenuBar = menuBar;
- m_frameMenuBar->MacInstallMenuBar() ;
- m_frameMenuBar->Attach(this);
+// m_frameMenuBar->MacInstallMenuBar() ;
+ m_frameMenuBar->Attach((wxFrame *)this);
}
// Responds to colour changes, and passes event on to children.
-void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxFrameMac::OnSysColourChanged(wxSysColourChangedEvent& event)
{
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
Refresh();
// Default activation behaviour - set the focus for the first child
// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
+void wxFrameMac::OnActivate(wxActivateEvent& event)
{
if ( !event.GetActive() )
{
+ // remember the last focused child
+ m_winLastFocused = FindFocus();
+ while ( m_winLastFocused )
+ {
+ if ( GetChildren().Find(m_winLastFocused) )
+ break;
+
+ m_winLastFocused = m_winLastFocused->GetParent();
+ }
+
event.Skip();
- return;
}
-
+ else
+ {
+/*
for ( wxWindowList::Node *node = GetChildren().GetFirst();
node;
node = node->GetNext() )
// restore focus
wxWindow *child = node->GetData();
- if ( !child->IsTopLevel()
+ if ( !child->IsTopLevel() && child->AcceptsFocus()
#if wxUSE_TOOLBAR
&& !wxDynamicCast(child, wxToolBar)
#endif // wxUSE_TOOLBAR
)
{
child->SetFocus();
- return;
+ break;
}
}
+ */
+ wxSetFocusToChild(this, &m_winLastFocused);
+
+ if ( m_frameMenuBar != NULL )
+ {
+ m_frameMenuBar->MacInstallMenuBar() ;
+ }
+ }
}
-void wxFrame::DoGetClientSize(int *x, int *y) const
+void wxFrameMac::DoGetClientSize(int *x, int *y) const
{
wxWindow::DoGetClientSize( x , y ) ;
{
int statusX, statusY;
GetStatusBar()->GetClientSize(&statusX, &statusY);
- // right now this is a constant, this might change someday
- *y -= WX_MAC_STATUSBAR_HEIGHT ;
+ *y -= statusY;
}
#endif // wxUSE_STATUSBAR
*x -= pt.x;
}
-void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
+void wxFrameMac::DoSetClientSize(int clientwidth, int clientheight)
{
int currentclientwidth , currentclientheight ;
int currentwidth , currentheight ;
#if wxUSE_TOOLBAR
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+wxToolBar* wxFrameMac::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
if ( wxFrameBase::CreateToolBar(style, id, name) )
{
return m_frameToolBar;
}
-void wxFrame::PositionToolBar()
+void wxFrameMac::PositionToolBar()
{
int cw, ch;