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

Merge wxBitmapButton and wxButton panels in the xrc sample.

Browse Source 
There are already way too many pages in the "Controls Example" in the sample,
combine wxBitmapButton and wxButton ones to save some space and make it more
usable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-10-20 23:11:09 +00:00
parent 4d9d127f45
commit 528f2a25ca
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
samples/xrc/rc/controls.xrc
View File

@ -202,31 +202,11 @@
</object>
<object class="notebookpage">
<label>wxBitmapButton</label>
<object class="wxPanel" name="bitmapbutton">
<object class="wxFlexGridSizer">
<cols>1</cols>
<rows>0</rows>
<vgap>0</vgap>
<hgap>0</hgap>
<growablecols>0</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALIGN_CENTRE|wxALL</flag>
<border>5</border>
<object class="wxBitmapButton" name="controls_bitmapbutton">
<bitmap>controls.xpm</bitmap>
</object>
</object>
</object>
</object>
</object>
<object class="notebookpage">
<label>wxButton</label>
<object class="wxPanel" name="button">
<object class="wxFlexGridSizer">
<cols>2</cols>
<cols>4</cols>
<rows>0</rows>
<vgap>0</vgap>
<hgap>0</hgap>
@ -261,6 +241,20 @@
<label>OK</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
<border>5</border>
<object class="wxStaticText">
<label>wxBitmapButton</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_CENTRE|wxALL</flag>
<border>5</border>
<object class="wxBitmapButton" name="controls_bitmapbutton">
<bitmap>controls.xpm</bitmap>
</object>
</object>
</object>
</object>
</object>