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 e5faea49f62f79b69c2d593edca1ef2462340414..ea41b0869c9ada3f25a862b3b5389214625b635f 100644 (file)
--- 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>