Remove unnecessary OW recognition.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 4e4ca874d1d5eb3ded561f2e004b229ecab171f8..0b3f4c8672c08be04a0266d8c9890f6641111d8e 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -473,11 +473,11 @@ typedef int wxWindowID;
 /*  appending the current line number to the given identifier to reduce the */
 /*  probability of the conflict (it may still happen if this is used in the */
 /*  headers, hence you should avoid doing it or provide unique prefixes then) */
-#ifdef __VISUALC__
+#if defined(__VISUALC__) && (__VISUALC__ >= 1300)
     /*
        __LINE__ handling is completely broken in VC++ when using "Edit and
        Continue" (/ZI option) and results in preprocessor errors if we use it
-       inside the macros. Luckily it has another standard macro which can be
+       inside the macros. Luckily VC7 has another standard macro which can be
        used like this and is even better than __LINE__ because it is globally
        unique.
      */
@@ -1874,7 +1874,7 @@ enum wxKeyCode
     WXK_SPACE   =    32,
     WXK_DELETE  =    127,
 
-    WXK_START   = 300,
+    WXK_START   = 300, /* FIXME:  Conflicts with UNICODE */
     WXK_LBUTTON,
     WXK_RBUTTON,
     WXK_CANCEL,