added support for <bg> tag for toolbars in XRC

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

diff --git a/docs/changes.txt b/docs/changes.txt
index eb0f8f27a1ada7b8de1c69124c64e328f6106094..f5d6bd9d9a2f2e12c753eabacbb1846a074ac53d 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -76,7 +76,7 @@ All (GUI):
 - Added SetSheetStyle to wxPropertySheetDialog and allowed it to
   behave like a Mac OS X settings dialog.
 - wxDC::BeginDrawing() and wxDC::EndDrawing() deprecated.
-- Added <disabled> XRC tag for wxToolBar elements
+- Added <disabled> XRC tag for wxToolBar elements and <bg> for wxToolBar itself
 
 wxMSW:
 

diff --git a/docs/tech/tn0014.txt b/docs/tech/tn0014.txt
index 6260226d17c288a1d169efb1a4795cccbe17b47a..f40c7add342d11424c6c97bfb273f54c47889270 100644 (file)
--- a/docs/tech/tn0014.txt
+++ b/docs/tech/tn0014.txt
@@ -441,6 +441,7 @@ bitmapsize                 Size                    -1,-1
 margins                    Size                    -1,-1
 packing                    Integer                 -1
 separation                 Integer                 -1
+bg                         Background colour       None
 
 wxToolBar node may have children <object> and <object_ref> nodes. Their class
 may be either "tool", "separator" or any wxWidgets class derived from

diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index ba53f016f08b610c78608ed78edd86b92fdb1ed7..62dd7707167d33def5047c7b418204d45c3809fd 100644 (file)
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -118,6 +118,8 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
         long separation = GetLong(wxT("separation"), -1);
         if (separation != -1)
             toolbar->SetToolSeparation(separation);
+        if (HasParam(wxT("bg")))
+            toolbar->SetBackgroundColour(GetColour(wxT("bg")));
 
         wxXmlNode *children_node = GetParamNode(wxT("object"));
         if (!children_node)