added and documented wxTB_NOICONS and wxTB_TEXT style flags

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index d5c0824faa5281924ae111dc2c2728f9a7527fcf..c5c7dc3a4f71f24892415d23f9ec65d6f96145de 100644 (file)
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -56,6 +56,8 @@ The toolbar orientation must always be {\bf wxHORIZONTAL}.
 \twocolitem{\windowstyle{wxTB\_VERTICAL}}{Specifies vertical layout (not available for the GTK and Windows 95
 toolbar).}
 \twocolitem{\windowstyle{wxTB\_3DBUTTONS}}{Gives wxToolBarSimple a mild 3D look to its buttons.}
+\twocolitem{\windowstyle{wxTB\_TEXT}}{Show the text in the toolbar buttons, by default only icons are shown}
+\twocolitem{\windowstyle{wxTB\_NOICONS}}{Doesn't show the icons in the toolbar buttons, by default they are shown}
 \end{twocollist}
 
 See also \helpref{window styles overview}{windowstyles}.

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 9601f2c17d4ca33859f55ad81f8960464a1c0085..8033d8540d565ffd83fe41f11203b7cb72b9d2eb 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -974,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
  */
@@ -1125,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
  */