Use wxWebKitCtrlNameStr to adhere to the convention used by other wx classes.

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index abb2278afbf22a3500be8beed245cd3445c136f0..957c26b2aea60f2f7dbb20cfbf45d7772a2dba72 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -33,20 +33,25 @@
     __WXOSX_IPHONE__ means OS X iPhone
 */
 
-/* backwards compatible define, until configure gets updated */
-#if defined __WXMAC__
-#define __WXOSX_CARBON__ 1
-#endif
+/*
+    Normally all of __WXOSX_XXX__, __WXOSX__ and __WXMAC__ are defined by
+    configure but ensure that we also define them if configure was not used for
+    whatever reason.
 
+    The primare symbol remains __WXOSX_XXX__ one, __WXOSX__ exists to allow
+    checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name
+    for it.
+ */
 #if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__)
-#   define __WXOSX__ 1
-#endif
-
-#ifdef __WXOSX__
-/* for backwards compatibility of code (including our own) define __WXMAC__ */
+#   ifndef __WXOSX__
+#       define __WXOSX__ 1
+#   endif
 #   ifndef __WXMAC__
 #       define __WXMAC__ 1
 #   endif
+#endif
+
+#ifdef __WXOSX__
 /* setup precise defines according to sdk used */
 #   include <TargetConditionals.h>
 #   if defined(__WXOSX_IPHONE__)
@@ -539,8 +544,10 @@
 #       define __VISUALC8__
 #   elif __VISUALC__ < 1600
 #       define __VISUALC9__
+#   elif __VISUALC__ < 1700
+#       define __VISUALC10__
 #   else
-#       pragma message("Please update this code for the next VC++ version")
+#       pragma message("Please update wx/platform.h to recognize this VC++ version")
 #   endif
 
 #    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)