Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index be319e0322a78a56b9dc270ff33680d7d1250f6f..a3ea865ebd1303bc6f23c338a825df7e5aae09bf 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -127,15 +127,6 @@
 // check for native bool type and TRUE/FALSE constants
 // ----------------------------------------------------------------------------
 
 // check for native bool type and TRUE/FALSE constants
 // ----------------------------------------------------------------------------
 

-// define boolean constants if not done yet
-#ifndef TRUE
-    #define TRUE  1
-#endif
-
-#ifndef FALSE
-    #define FALSE 0
-#endif
-

 // Add more tests here for Windows compilers that already define bool
 // (under Unix, configure tests for this)
 #ifndef HAVE_BOOL
 // Add more tests here for Windows compilers that already define bool
 // (under Unix, configure tests for this)
 #ifndef HAVE_BOOL


@@ -180,9 +171,27 @@
     // NB: of course, this doesn't replace the standard type, because, for
     //     example, overloading based on bool/int parameter doesn't work and
     //     so should be avoided in portable programs
     // NB: of course, this doesn't replace the standard type, because, for
     //     example, overloading based on bool/int parameter doesn't work and
     //     so should be avoided in portable programs

-typedef unsigned int bool;
+    typedef unsigned int bool;

 #endif // bool
 
 #endif // bool
 

+#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)
+#else // !__cplusplus
+    // the definitions above don't work for C sources
+    #ifndef TRUE
+        #define TRUE 1
+    #endif
+
+    #ifndef FALSE
+        #define FALSE 0
+    #endif
+#endif // C++/!C++
+

 typedef short int WXTYPE;
 
 // special care should be taken with this type under Windows where the real
 typedef short int WXTYPE;
 
 // special care should be taken with this type under Windows where the real


@@ -196,17 +205,16 @@ typedef int wxWindowID;
 // other feature tests
 // ----------------------------------------------------------------------------
 
 // other feature tests
 // ----------------------------------------------------------------------------
 

-    // Every ride down a slippery slope begins with a single step..
-    //
-    // Yes, using nested classes is indeed against our coding standards in
-    // general, but there are places where you can use them to advantage
-    // without totally breaking ports that cannot use them.  If you do, then
-    // wrap it in this guard, but such cases should still be relatively rare.
-
+// Every ride down a slippery slope begins with a single step..
+//
+// Yes, using nested classes is indeed against our coding standards in
+// general, but there are places where you can use them to advantage
+// without totally breaking ports that cannot use them.  If you do, then
+// wrap it in this guard, but such cases should still be relatively rare.

 #ifndef __WIN16__
 #ifndef __WIN16__

-#define wxUSE_NESTED_CLASSES    1
+    #define wxUSE_NESTED_CLASSES    1

 #else
 #else

-#define wxUSE_NESTED_CLASSES    0
+    #define wxUSE_NESTED_CLASSES    0

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -1159,6 +1167,12 @@ enum wxBorder
 // be modal. No progress will then be made at all.
 #define wxPD_REMAINING_TIME     0x0040
 
 // be modal. No progress will then be made at all.
 #define wxPD_REMAINING_TIME     0x0040
 

+/*
+ * wxDirDialog styles
+ */
+
+#define wxDD_NEW_DIR_BUTTON     0x0080
+

 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these
 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these


@@ -1449,6 +1463,7 @@ enum wxDataFormatId
     wxDF_FILENAME =         15, /* CF_HDROP */
     wxDF_LOCALE =           16,
     wxDF_PRIVATE =          20,
     wxDF_FILENAME =         15, /* CF_HDROP */
     wxDF_LOCALE =           16,
     wxDF_PRIVATE =          20,

+    wxDF_HTML =             30, /* Note: does not correspond to CF_ constant */

     wxDF_MAX
 };
 
     wxDF_MAX
 };