X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d497dca47560bb375902c2a261d819e7470a92b3..e5f0419b0d8437e20b50a0bf40a782dc1795d512:/src/mac/frame.cpp

diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp
index 5b2a84bbb3..4fe1aec422 100644
--- a/src/mac/frame.cpp
+++ b/src/mac/frame.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp
-// Purpose:     wxFrameMac
+// Purpose:     wxFrame
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
@@ -29,24 +29,21 @@ extern wxWindowList wxModelessWindows;
 extern wxList wxPendingDelete;
 
 #if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrameMac, wxFrameBase)
-  EVT_ACTIVATE(wxFrameMac::OnActivate)
- // EVT_MENU_HIGHLIGHT_ALL(wxFrameMac::OnMenuHighlight)
-  EVT_SYS_COLOUR_CHANGED(wxFrameMac::OnSysColourChanged)
-//  EVT_IDLE(wxFrameMac::OnIdle)
-//  EVT_CLOSE(wxFrameMac::OnCloseWindow)
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+  EVT_ACTIVATE(wxFrame::OnActivate)
+ // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
+  EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
+//  EVT_IDLE(wxFrame::OnIdle)
+//  EVT_CLOSE(wxFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrameMac, wxWindow)
-#endif
-#ifndef __WXUNIVERSAL__
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMac)
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 #endif
 
 #if wxUSE_NATIVE_STATUSBAR
-bool wxFrameMac::m_useNativeStatusBar = TRUE;
+bool wxFrame::m_useNativeStatusBar = TRUE;
 #else
-bool wxFrameMac::m_useNativeStatusBar = FALSE;
+bool wxFrame::m_useNativeStatusBar = FALSE;
 #endif
 
 #define WX_MAC_STATUSBAR_HEIGHT 15 
@@ -54,7 +51,7 @@ bool wxFrameMac::m_useNativeStatusBar = FALSE;
 // creation/destruction
 // ----------------------------------------------------------------------------
 
-void wxFrameMac::Init()
+void wxFrame::Init()
 {
   m_frameMenuBar = NULL;
 
@@ -71,7 +68,7 @@ void wxFrameMac::Init()
 #endif
 }
 
-wxPoint wxFrameMac::GetClientAreaOrigin() const
+wxPoint wxFrame::GetClientAreaOrigin() const
 {
 	// on mac we are at position -1,-1 with the control
     wxPoint pt(0, 0);
@@ -96,7 +93,7 @@ wxPoint wxFrameMac::GetClientAreaOrigin() const
     return pt;
 }
 
-bool wxFrameMac::Create(wxWindow *parent,
+bool wxFrame::Create(wxWindow *parent,
            wxWindowID id,
            const wxString& title,
            const wxPoint& pos,
@@ -104,21 +101,22 @@ bool wxFrameMac::Create(wxWindow *parent,
            long style,
            const wxString& name)
 {
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+  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_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
+	m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
+	SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
 
   wxModelessWindows.Append(this);
 
   return TRUE;
 }
 
-wxFrameMac::~wxFrameMac()
+wxFrame::~wxFrame()
 {
   m_isBeingDeleted = TRUE;
 
@@ -127,7 +125,7 @@ wxFrameMac::~wxFrameMac()
 }
 
 
-bool wxFrameMac::Enable(bool enable)
+bool wxFrame::Enable(bool enable)
 {
     if ( !wxWindow::Enable(enable) )
         return FALSE;
@@ -143,7 +141,7 @@ bool wxFrameMac::Enable(bool enable)
     return TRUE;
 }
 
-wxStatusBar *wxFrameMac::OnCreateStatusBar(int number, long style, wxWindowID id,
+wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name)
 {
     wxStatusBar *statusBar = NULL;
@@ -155,7 +153,7 @@ wxStatusBar *wxFrameMac::OnCreateStatusBar(int number, long style, wxWindowID id
     return statusBar;
 }
 
-void wxFrameMac::PositionStatusBar()
+void wxFrame::PositionStatusBar()
 {
   if (m_frameStatusBar )
   {
@@ -171,9 +169,9 @@ void wxFrameMac::PositionStatusBar()
 }
 
 // Responds to colour changes, and passes event on to children.
-void wxFrameMac::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 
     if ( m_frameStatusBar )
@@ -190,7 +188,7 @@ void wxFrameMac::OnSysColourChanged(wxSysColourChangedEvent& event)
 
 // Default activation behaviour - set the focus for the first child
 // subwindow found.
-void wxFrameMac::OnActivate(wxActivateEvent& event)
+void wxFrame::OnActivate(wxActivateEvent& event)
 {
     if ( !event.GetActive() )
     {
@@ -235,7 +233,7 @@ void wxFrameMac::OnActivate(wxActivateEvent& event)
 	}
 }
 
-void wxFrameMac::DoGetClientSize(int *x, int *y) const
+void wxFrame::DoGetClientSize(int *x, int *y) const
 {
 	wxWindow::DoGetClientSize( x , y ) ;
 
@@ -255,7 +253,7 @@ void wxFrameMac::DoGetClientSize(int *x, int *y) const
     *x -= pt.x;
 }
 
-void wxFrameMac::DoSetClientSize(int clientwidth, int clientheight)
+void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
 {
 	int currentclientwidth , currentclientheight ;
 	int currentwidth , currentheight ;
@@ -275,7 +273,7 @@ void wxFrameMac::DoSetClientSize(int clientwidth, int clientheight)
 
 
 #if wxUSE_TOOLBAR
-wxToolBar* wxFrameMac::CreateToolBar(long style, wxWindowID id, const wxString& name)
+wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     if ( wxFrameBase::CreateToolBar(style, id, name) )
     {
@@ -285,7 +283,7 @@ wxToolBar* wxFrameMac::CreateToolBar(long style, wxWindowID id, const wxString&
     return m_frameToolBar;
 }
 
-void wxFrameMac::PositionToolBar()
+void wxFrame::PositionToolBar()
 {
     int cw, ch;