X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac0fa9eff8c1137564bcd88084e3c1cdac54b679..80c82e01758cd838aa5c922b848454277b11da26:/src/mac/frame.cpp

diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp
index 81f6b40bee..4d83421744 100644
--- a/src/mac/frame.cpp
+++ b/src/mac/frame.cpp
@@ -101,14 +101,15 @@ bool wxFrame::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);
 
@@ -131,7 +132,8 @@ bool wxFrame::Enable(bool enable)
 
 	if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
 	{
-		for ( int i = 0 ; i < m_frameMenuBar->GetMenuCount() ; ++ i )
+ 		int iMaxMenu = m_frameMenuBar->GetMenuCount(); 
+		for ( int i = 0 ; i < iMaxMenu ; ++ i )
 		{
 			m_frameMenuBar->EnableTop( i , enable ) ;
 		}
@@ -170,7 +172,7 @@ void wxFrame::PositionStatusBar()
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 
     if ( m_frameStatusBar )