use MSWCreateControl() instead of the old mess; implemented Get(Class)DefaultAttributes()

[wxWidgets.git] / include / wx / platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 2d9c7d6a3cebd34b42bdc0f5c1ea27f1aea85a95..6085934aa8b6297d9e7dfe82547ce631e7ca025c 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -152,7 +152,10 @@
 #   endif
 #endif /* wxUSE_UNICODE */
 
 #   endif
 #endif /* wxUSE_UNICODE */
 

-
+#if defined( __MWERKS__ ) && !defined(__INTEL__)
+// otherwise MSL headers bring in WIN32 dependant APIs
+#undef UNICODE
+#endif

 /*
    some compilers don't support iostream.h any longer, while some of theme
    are not updated with <iostream> yet, so override the users setting here
 /*
    some compilers don't support iostream.h any longer, while some of theme
    are not updated with <iostream> yet, so override the users setting here


@@ -308,7 +311,7 @@
 
     /* to be changed for Win64! */
 #    ifndef __WIN32__
 
     /* to be changed for Win64! */
 #    ifndef __WIN32__

-#        define __WIN16__
+#        error "__WIN32__ should be defined for Win32 and Win64, Win16 is not supported"

 #    endif
 
     /*
 #    endif
 
     /*