From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 20 Oct 2010 23:11:09 +0000 (+0000)
Subject: Merge wxBitmapButton and wxButton panels in the xrc sample.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/528f2a25caa22c98af73f5b5cc422b8d4e4b0407?ds=inline

Merge wxBitmapButton and wxButton panels in the xrc sample.

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
---

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index e5faea49f6..ea41b0869c 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -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>