added wxSemaphore (with docs), new version of wxCondition and bug fixes to wxThread...

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 910fa95d84a0091acf1039faf6945f93556b8a7c..8033d8540d565ffd83fe41f11203b7cb72b9d2eb 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -35,6 +35,9 @@
 #endif // Unix/!Unix
 #endif
 
+// include the feature test macros
+#include "wx/features.h"
+
 // suppress some Visual C++ warnings
 #ifdef __VISUALC__
 #   pragma warning(disable:4201)    // nonstandard extension used: nameless struct/union
@@ -971,17 +974,6 @@ enum wxBorder
 #   define wxEXT_DIALOG_STYLE  (wxDEFAULT_DIALOG_STYLE|wxED_CLIENT_MARGIN|wxED_STATIC_LINE)
 #endif
 
-/*
- * wxToolBar style flags
- */
-#define wxTB_HORIZONTAL         wxHORIZONTAL
-#define wxTB_VERTICAL           wxVERTICAL
-#define wxTB_3DBUTTONS          0x0010
-// Flatbar/Coolbar under Win98/ GTK 1.2
-#define wxTB_FLAT               0x0020
-// use native docking under GTK
-#define wxTB_DOCKABLE           0x0040
-
 /*
  * wxMenuBar style flags
  */
@@ -1122,6 +1114,15 @@ enum wxBorder
 #define wxTC_OWNERDRAW        0x0040
 #define wxTC_MULTILINE        wxNB_MULTILINE
 
+// wxToolBar style flags
+#define wxTB_HORIZONTAL     wxHORIZONTAL    // == 0x0004
+#define wxTB_VERTICAL       wxVERTICAL      // == 0x0008
+#define wxTB_3DBUTTONS      0x0010
+#define wxTB_FLAT           0x0020          // supported only under Win98+/GTK
+#define wxTB_DOCKABLE       0x0040          // use native docking under GTK
+#define wxTB_NOICONS        0x0080          // don't show the icons
+#define wxTB_TEXT           0x0100          // show the text
+
 /*
  * wxStatusBar95 flags
  */
@@ -1276,6 +1277,16 @@ enum wxBorder
 // constants
 // ----------------------------------------------------------------------------
 
+// menu and toolbar item kinds
+enum wxItemKind
+{
+    wxITEM_SEPARATOR = -1,
+    wxITEM_NORMAL,
+    wxITEM_CHECK,
+    wxITEM_RADIO,
+    wxITEM_MAX
+};
+
 // hit test results
 enum wxHitTest
 {