Redirect SetFocus Part II.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 80b4fbb8458a8e219deb9edb90ac2357df7a9743..f87619fa484dee35d1f6f5271f2585069834d15f 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -176,11 +176,23 @@
 
 #ifdef __cplusplus
     // define boolean constants: don't use true/false here as not all compilers
-    // support them
-    #undef TRUE
-    #undef FALSE
-    #define TRUE  ((bool)1)
-    #define FALSE ((bool)0)
+    // support them but also redefine TRUE which could have been defined as 1
+    // by previous headers: this would be incorrect as our TRUE is supposed to
+    // be of type bool, just like true, not int
+    //
+    // however if the user code absolutely needs TRUE to be defined in its own
+    // way, it can predefine WX_TRUE_DEFINED to prevent the redefinition here
+    #ifdef TRUE
+        #ifndef WX_TRUE_DEFINED
+            #undef TRUE
+            #undef FALSE
+        #endif
+    #endif
+
+    #ifndef TRUE
+        #define TRUE  ((bool)1)
+        #define FALSE ((bool)0)
+    #endif
 #else // !__cplusplus
     // the definitions above don't work for C sources
     #ifndef TRUE
@@ -1463,6 +1475,7 @@ enum wxDataFormatId
     wxDF_FILENAME =         15, /* CF_HDROP */
     wxDF_LOCALE =           16,
     wxDF_PRIVATE =          20,
+    wxDF_HTML =             30, /* Note: does not correspond to CF_ constant */
     wxDF_MAX
 };