Added toolbar wxTB_TEXT flag and tool label property

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

diff --git a/wxPython/wx/tools/XRCed/xxx.py b/wxPython/wx/tools/XRCed/xxx.py
index 1fb1c81ebee34e696640277e1fa8f429658a8cec..29809fdfdfcc060cdc031c6c2e9b44bb0a36bccb 100644 (file)
--- a/wxPython/wx/tools/XRCed/xxx.py
+++ b/wxPython/wx/tools/XRCed/xxx.py
@@ -395,7 +395,7 @@ class xxxFrame(xxxContainer):
     exStyles = ['wxWS_EX_VALIDATE_RECURSIVELY']
 
 class xxxTool(xxxObject):
     exStyles = ['wxWS_EX_VALIDATE_RECURSIVELY']
 
 class xxxTool(xxxObject):

-    allParams = ['bitmap', 'bitmap2', 'toggle', 'tooltip', 'longhelp']
+    allParams = ['bitmap', 'bitmap2', 'toggle', 'tooltip', 'longhelp', 'label']

     required = ['bitmap']
     paramDict = {'bitmap2': ParamBitmap, 'toggle': ParamBool}
     hasStyle = False
     required = ['bitmap']
     paramDict = {'bitmap2': ParamBitmap, 'toggle': ParamBool}
     hasStyle = False


@@ -407,7 +407,7 @@ class xxxToolBar(xxxContainer):
     paramDict = {'bitmapsize': ParamPosSize, 'margins': ParamPosSize,
                  'packing': ParamInt, 'separation': ParamInt,
                  'style': ParamNonGenericStyle}
     paramDict = {'bitmapsize': ParamPosSize, 'margins': ParamPosSize,
                  'packing': ParamInt, 'separation': ParamInt,
                  'style': ParamNonGenericStyle}

-    winStyles = ['wxTB_FLAT', 'wxTB_DOCKABLE', 'wxTB_VERTICAL', 'wxTB_HORIZONTAL']
+    winStyles = ['wxTB_FLAT', 'wxTB_DOCKABLE', 'wxTB_VERTICAL', 'wxTB_HORIZONTAL', 'wxTB_TEXT']

 
 ################################################################################
 # Bitmap, Icon
 
 ################################################################################
 # Bitmap, Icon