Add support for fixed spacers and labels to wxAuiToolBar XRC handler.

Allow specifying "width" and "proportion" attributes for the "space" elements
and add "label" element support.

Closes #15964.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-02-18 15:05:52 +00:00
parent d64c74160b
commit 0206eb6161
5 changed files with 76 additions and 8 deletions

View File

@@ -4,16 +4,24 @@
<title>AUI XRC demo</title>
<centered>1</centered>
<style>wxCAPTION|wxRESIZE_BORDER</style>
<size>-1,300</size>
<size>500,300</size>
<object class="wxBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<flag>wxEXPAND</flag>
<object class="wxAuiToolBar" name="aui_toolbar">
<style>wxAUI_TB_TEXT|wxAUI_TB_GRIPPER</style>
<object class="label" name="label1">
<label>Tools:</label>
<width>-1</width>
</object>
<object class="tool" name="tool1">
<bitmap stock_id="wxART_NEW"/>
<label>Tool 1</label>
</object>
<object class="space">
<width>25</width>
</object>
<object class="tool" name="tool2">
<bitmap stock_id="wxART_FILE_OPEN"/>
<label>Tool 2</label>
@@ -34,7 +42,9 @@
</dropdown>
</object>
<object class="separator"/>
<object class="space"/>
<object class="space">
<proportion>3</proportion>
</object>
<object class="wxComboBox">
<content>
<item>Just a</item>
@@ -43,7 +53,7 @@
</content>
</object>
<object class="space"/>
</object>
</object>
</object>
<object class="sizeritem">
<option>1</option>