Mac compile fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/fontenum.cpp b/src/mac/carbon/fontenum.cpp
index 355b4abcbb35da0c9965b6200e63ced21c59ed9b..adb3957eca576b6e4c2628997251da448d18ecc1 100644 (file)
--- a/src/mac/carbon/fontenum.cpp
+++ b/src/mac/carbon/fontenum.cpp
@@ -23,6 +23,7 @@
 #include "wx/fontmap.h"
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"
 #include "wx/fontmap.h"
 #include "wx/fontutil.h"
 #include "wx/encinfo.h"

+#include "wx/intl.h"

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

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index ee4db9c392f07f6f2deba1a772e085f2ede3f634..503efaaa610fbec6c484d2fa690888eddd3c5577 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -302,7 +302,7 @@ bool wxMDIParentFrame::ShouldBeVisible() const
         if ( win->IsShown()
                 && !wxDynamicCast(win, wxMDIChildFrame)
 #if wxUSE_STATUSBAR
         if ( win->IsShown()
                 && !wxDynamicCast(win, wxMDIChildFrame)
 #if wxUSE_STATUSBAR

-                && win != GetStatusBar()
+                && win != (wxWindow*) GetStatusBar()

 #endif
                 && win != GetClientWindow() )
         {
 #endif
                 && win != GetClientWindow() )
         {