non mach-o fix

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

diff --git a/src/mac/carbon/dialog.cpp b/src/mac/carbon/dialog.cpp
index 8d23d958eb0c397dffafa0b19c9673ae989a2bab..402b749e7c15a25e5478bcd0f03b3c661686f8a1 100644 (file)
--- a/src/mac/carbon/dialog.cpp
+++ b/src/mac/carbon/dialog.cpp
@@ -64,11 +64,13 @@ bool wxDialog::Create( wxWindow *parent,
 
     if ( !wxTopLevelWindow::Create( parent, id, title, pos, size, style, name ) )
         return false;
 
     if ( !wxTopLevelWindow::Create( parent, id, title, pos, size, style, name ) )
         return false;

-
+   
+#if TARGET_API_MAC_OSX

     HIViewRef growBoxRef = 0 ;
     OSStatus err = HIViewFindByID( HIViewGetRoot( (WindowRef)m_macWindow ), kHIViewWindowGrowBoxID, &growBoxRef  );
     if ( err == noErr && growBoxRef != 0 )
         HIGrowBoxViewSetTransparent( growBoxRef, true ) ;
     HIViewRef growBoxRef = 0 ;
     OSStatus err = HIViewFindByID( HIViewGetRoot( (WindowRef)m_macWindow ), kHIViewWindowGrowBoxID, &growBoxRef  );
     if ( err == noErr && growBoxRef != 0 )
         HIGrowBoxViewSetTransparent( growBoxRef, true ) ;

+#endif

 
     return true;
 }
 
     return true;
 }

diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
index 9619dfcc2fa5ecf9c63daabf01e821aad59c4dc9..7b6eb4ef42ba2a22e9c09dfbcda19ce01fb58271 100644 (file)
--- a/src/mac/carbon/display.cpp
+++ b/src/mac/carbon/display.cpp
@@ -31,6 +31,7 @@
     #include <Quickdraw.h>
     #include <Video.h>  // for VDSwitchInfoRec
     #include <FixMath.h>
     #include <Quickdraw.h>
     #include <Video.h>  // for VDSwitchInfoRec
     #include <FixMath.h>

+    #include <Debugging.h>

 #endif
 
 #include "wx/display.h"
 #endif
 
 #include "wx/display.h"

diff --git a/src/mac/carbon/evtloop.cpp b/src/mac/carbon/evtloop.cpp
index ab9e51700d43399ad1b662bfb50424ca03f43b1c..d5a9804e67757f57509bfa04e882e7d8585ad7a4 100644 (file)
--- a/src/mac/carbon/evtloop.cpp
+++ b/src/mac/carbon/evtloop.cpp
@@ -27,8 +27,11 @@
 #include "wx/evtloop.h"
 #include "wx/app.h"
 
 #include "wx/evtloop.h"
 #include "wx/app.h"
 

-#include <Carbon/Carbon.h>
-
+#ifdef __DARWIN__
+    #include <Carbon/Carbon.h>
+#else
+    #include <Carbon.h>
+#endif

 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================