Various fixes for Textctrl and Popup Menus.

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

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 79197cdecdac5ba29e42bfe0d284d6f07b0d0d23..024c4fb6c724e0cf4e08223e8c548d08f960b4be 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -17,7 +17,9 @@
 #include "wx/menu.h"
 #include "wx/settings.h"
 
 #include "wx/menu.h"
 #include "wx/settings.h"
 

-extern wxList wxModelessWindows;
+#include "wx/mac/private.h"
+
+extern wxWindowList wxModelessWindows;

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)


@@ -242,7 +244,7 @@ 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 ;

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


@@ -298,7 +300,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;