Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added support for <bg> tag for toolbars in XRC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-02-08 13:22:56 +00:00
parent 114807c0b2
commit 700dbceb37
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@@ -76,7 +76,7 @@ All (GUI):
- Added SetSheetStyle to wxPropertySheetDialog and allowed it to - Added SetSheetStyle to wxPropertySheetDialog and allowed it to
behave like a Mac OS X settings dialog. behave like a Mac OS X settings dialog.
- wxDC::BeginDrawing() and wxDC::EndDrawing() deprecated. - 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: wxMSW:

1
docs/tech/tn0014.txt
View File

@@ -441,6 +441,7 @@ bitmapsize Size -1,-1
margins Size -1,-1 margins Size -1,-1
packing Integer -1 packing Integer -1
separation Integer -1 separation Integer -1
bg Background colour None
wxToolBar node may have children <object> and <object_ref> nodes. Their class wxToolBar node may have children <object> and <object_ref> nodes. Their class
may be either "tool", "separator" or any wxWidgets class derived from may be either "tool", "separator" or any wxWidgets class derived from

2
src/xrc/xh_toolb.cpp
View File

@@ -118,6 +118,8 @@ wxObject *wxToolBarXmlHandler::DoCreateResource()
long separation = GetLong(wxT("separation"), -1); long separation = GetLong(wxT("separation"), -1);
if (separation != -1) if (separation != -1)
toolbar->SetToolSeparation(separation); toolbar->SetToolSeparation(separation);
if (HasParam(wxT("bg")))
toolbar->SetBackgroundColour(GetColour(wxT("bg")));
wxXmlNode *children_node = GetParamNode(wxT("object")); wxXmlNode *children_node = GetParamNode(wxT("object"));
if (!children_node) if (!children_node)