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
This commit is contained in:
parent
114807c0b2
commit
700dbceb37
@ -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:
|
||||
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user