Added Delete member to wxStringHashTable in order to implement

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 897d1addb35c915dfcbebabb903824133090e8ae..666ab318082a7d680f6ba1eb2dd000419d51de19 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -186,10 +186,13 @@
         #ifndef WX_TRUE_DEFINED
             #undef TRUE
             #undef FALSE
         #ifndef WX_TRUE_DEFINED
             #undef TRUE
             #undef FALSE

-            #define TRUE  ((bool)1)
-            #define FALSE ((bool)0)

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


@@ -943,11 +946,11 @@ enum wxBorder
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 #define wxFRAME_NO_TASKBAR      0x0002  // No taskbar button (MSW only)
 #define wxFRAME_TOOL_WINDOW     0x0004  // No taskbar button, no system menu
 #define wxDIALOG_NO_PARENT      0x0001  // Don't make owned by apps top window
 #define wxFRAME_NO_TASKBAR      0x0002  // No taskbar button (MSW only)
 #define wxFRAME_TOOL_WINDOW     0x0004  // No taskbar button, no system menu

+#define wxFRAME_FLOAT_ON_PARENT 0x0008  // Always above its parent

 
 // deprecated versions defined for compatibility reasons
 #define wxRESIZE_BOX            wxMAXIMIZE_BOX
 #define wxTHICK_FRAME           wxRESIZE_BORDER
 
 // deprecated versions defined for compatibility reasons
 #define wxRESIZE_BOX            wxMAXIMIZE_BOX
 #define wxTHICK_FRAME           wxRESIZE_BORDER

-#define wxFRAME_FLOAT_ON_PARENT wxFRAME_TOOL_WINDOW

 
 // obsolete styles, unused any more
 #define wxDIALOG_MODAL          0x0020  // free flag value 0x0020
 
 // obsolete styles, unused any more
 #define wxDIALOG_MODAL          0x0020  // free flag value 0x0020