corrections to includes for compilation under Mac OS X

[wxWidgets.git] / src / mac / carbon / corersrc.r

diff --git a/src/mac/carbon/corersrc.r b/src/mac/carbon/corersrc.r
index 4f879a59db46a2ac19c934312491b09756028912..4171a8faec9301177d8eb55df0e45cc773e6c89b 100644 (file)
--- 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
@@ -388,7 +391,7 @@ resource 'ldes' ( 128 )
                0 , 
                hasVertScroll , 
                noHorizScroll , 
-               128 , 
+               0 , 
                noGrowSpace , 
        }
 } ;
@@ -599,4 +602,4 @@ resource 'STR#' (251) {
        }
 };
 
-// end of get file
\ No newline at end of file
+// end of get file