only set focus on textctrl item if it exists (exists if combo box is editable)

[wxWidgets.git] / src / mac / carbon / mdi.cpp

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index f0d2f53138072a7f112915c640fc598f3befde1d..94b0244562d9749805a9fb4bd884b466fdf049ec 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -17,6 +17,8 @@
 #include "wx/menu.h"
 #include "wx/settings.h"
 
 #include "wx/menu.h"
 #include "wx/settings.h"
 

+#include "wx/mac/private.h"
+

 extern wxWindowList wxModelessWindows;
 
 #if !USE_SHARED_LIBRARY
 extern wxWindowList wxModelessWindows;
 
 #if !USE_SHARED_LIBRARY


@@ -242,7 +244,8 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
        MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
   
 
        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 FALSE;
 
     wxModelessWindows.Append(this);
     return FALSE;


@@ -298,7 +301,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     {
        parent->AddChild(this);
     }
     {
        parent->AddChild(this);
     }

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);

 
     wxModelessWindows.Append(this);
     return TRUE;
 
     wxModelessWindows.Append(this);
     return TRUE;