fix assert because of passing more than one border bit in style to the base class...

[wxWidgets.git] / include / wxshlb_cwc.pch

diff --git a/include/wxshlb_cwc.pch b/include/wxshlb_cwc.pch
index 4fb552767847ee13976b2703c557019ad1fc2afd..d1ce19d856123078bf705de4dd5fa24439cd9198 100644 (file)
--- a/include/wxshlb_cwc.pch
+++ b/include/wxshlb_cwc.pch
@@ -5,7 +5,9 @@
        #error "illegal processor for carbon"
 #endif
 #else
        #error "illegal processor for carbon"
 #endif
 #else

-#if __POWERPC__
+#if __MACH__
+       #pragma precompile_target "wxshlb_Mach.mch"
+#elif __POWERPC__

        #pragma precompile_target "wxshlb_Carbon.mch"
 #else
        #error "illegal processor for carbon"
        #pragma precompile_target "wxshlb_Carbon.mch"
 #else
        #error "illegal processor for carbon"


@@ -18,5 +20,19 @@
 #define wxUSE_GUI 1
 #define TARGET_CARBON 1
 #define OLDP2C 1
 #define wxUSE_GUI 1
 #define TARGET_CARBON 1
 #define OLDP2C 1

+#ifdef __MACH__
+       #define __DARWIN__
+       #define __CF_USE_FRAMEWORK_INCLUDES__
+       #define __NOEXTENSIONS__
+       #define __UNIX__
+       #define __UNIX_LIKE__
+    #define HAVE_USLEEP 1
+    #define HAVE_FCNTL  1
+    #define HAVE_UNAME  1
+#endif

 
 #include "wx/wx_cw_cm.h"
 
 #include "wx/wx_cw_cm.h"

+#ifdef __WXMSW__
+    #include <windows.h>
+    #include "wx/msw/winundef.h"
+#endif