From: Gilles Depeyrot <gilles_depeyrot@mac.com>
Date: Sat, 28 Apr 2001 13:32:21 +0000 (+0000)
Subject: corrections for Mac OS X
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/56cff9862095c87df124fae9d82616af5d85e24a

corrections for Mac OS X


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

diff --git a/src/mac/apprsrc.r b/src/mac/apprsrc.r
index 343157d8d1..92a2f5e4f1 100644
--- a/src/mac/apprsrc.r
+++ b/src/mac/apprsrc.r
@@ -1,4 +1,8 @@
-#include <Types.r>
+#ifdef __UNIX__
+#  include <Carbon.r>
+#else
+#  include <Types.r>
+#endif
 #include "apprsrc.h"
 
 resource 'STR#' ( 128 , "Simple Alert Messages" )
@@ -25,4 +29,4 @@ resource 'MENU' (1, preload)
 resource 'MBAR' (1,preload)
 {
 	{ 1 } ;
-} ;
\ No newline at end of file
+} ;
diff --git a/src/mac/carbon/apprsrc.r b/src/mac/carbon/apprsrc.r
index 343157d8d1..92a2f5e4f1 100644
--- a/src/mac/carbon/apprsrc.r
+++ b/src/mac/carbon/apprsrc.r
@@ -1,4 +1,8 @@
-#include <Types.r>
+#ifdef __UNIX__
+#  include <Carbon.r>
+#else
+#  include <Types.r>
+#endif
 #include "apprsrc.h"
 
 resource 'STR#' ( 128 , "Simple Alert Messages" )
@@ -25,4 +29,4 @@ resource 'MENU' (1, preload)
 resource 'MBAR' (1,preload)
 {
 	{ 1 } ;
-} ;
\ No newline at end of file
+} ;
diff --git a/src/mac/carbon/corersrc.r b/src/mac/carbon/corersrc.r
index 4f879a59db..0bc5febd8c 100644
--- a/src/mac/carbon/corersrc.r
+++ b/src/mac/carbon/corersrc.r
@@ -1,7 +1,10 @@
-#include <Types.r>
-
-#if UNIVERSAL_INTERFACES_VERSION > 0x320
-	#include <ControlDefinitions.r>
+#ifdef __UNIX__
+  #include <Carbon.r>
+#else
+  #include <Types.r>
+  #if UNIVERSAL_INTERFACES_VERSION > 0x320
+    #include <ControlDefinitions.r>
+  #endif
 #endif
 
 #define kMacOKAlertResourceID 128
@@ -599,4 +602,4 @@ resource 'STR#' (251) {
 	}
 };
 
-// end of get file
\ No newline at end of file
+// end of get file
diff --git a/src/mac/corersrc.r b/src/mac/corersrc.r
index 4f879a59db..0bc5febd8c 100644
--- a/src/mac/corersrc.r
+++ b/src/mac/corersrc.r
@@ -1,7 +1,10 @@
-#include <Types.r>
-
-#if UNIVERSAL_INTERFACES_VERSION > 0x320
-	#include <ControlDefinitions.r>
+#ifdef __UNIX__
+  #include <Carbon.r>
+#else
+  #include <Types.r>
+  #if UNIVERSAL_INTERFACES_VERSION > 0x320
+    #include <ControlDefinitions.r>
+  #endif
 #endif
 
 #define kMacOKAlertResourceID 128
@@ -599,4 +602,4 @@ resource 'STR#' (251) {
 	}
 };
 
-// end of get file
\ No newline at end of file
+// end of get file