merged the confllict resolution (I've fixed the m_format bug independently); no real...

[wxWidgets.git] / src / mac / apprsrc.r

diff --git a/src/mac/apprsrc.r b/src/mac/apprsrc.r
index 343157d8d1e636dde6fd82e288274e2df7e06464..020b34f73a3c96c34a9a8a88848e943d521fed7a 100644 (file)
--- 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" )
@@ -7,7 +11,7 @@ resource 'STR#' ( 128 , "Simple Alert Messages" )
        "This application needs at least a MacPlus" ,
        "This application needs more memory" ,
        "This application is out of memory" ,
-       "This application needs at least System 7.5" ,
+       "This application needs at least System 8.6" ,
        "About this wxWindows Application" ,
        "This application needs Appearance extension (built in with System 8) - this restriction will be relieved in the final release"
        }
@@ -25,4 +29,4 @@ resource 'MENU' (1, preload)
 resource 'MBAR' (1,preload)
 {
        { 1 } ;
-} ;
\ No newline at end of file
+} ;