Make it easier to define custom wxSizerXmlHandler subclasses.

[wxWidgets.git] / samples / xrc / rc / controls.xrc

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index e5faea49f62f79b69c2d593edca1ef2462340414..d192dd66e2bd448354170490aedc66d59af234c9 100644 (file)
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -57,6 +57,41 @@
                                     </object>
                                 </object>
                 </object>
+
+                <object class="notebookpage">
+                    <label>wxToolbook</label>
+                    <object class="wxToolbook" name="controls_toolbook">
+                    <style>wxTBK_HORZ_LAYOUT</style>
+                        <size>350,280</size>
+                        <imagelist>
+                            <bitmap stock_id="wxART_QUESTION"/>
+                            <bitmap stock_id="wxART_INFORMATION"/>
+                            <bitmap stock_id="wxART_GO_HOME"/>
+                        </imagelist>
+                        <object class="toolbookpage">
+                            <label>Page 1</label>
+                            <image>0</image>
+                            <object class="wxButton" name="controls_toolbook_button1">
+                                <label>Button N1</label>
+                            </object>
+                        </object>
+                        <object class="toolbookpage">
+                            <label>Page 2</label>
+                            <image>1</image>
+                            <object class="wxButton" name="controls_toolbook_button2">
+                                <label>Button N2</label>
+                            </object>
+                        </object>
+                        <object class="toolbookpage">
+                            <label>Page 3</label>
+                            <image>2</image>
+                            <object class="wxButton" name="controls_toolbook_button3">
+                                <label>Button N3</label>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+
                 <object class="notebookpage">
                     <label>wxToolBar</label>
                     <object class="wxPanel" name="button">
@@ -202,31 +237,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 +276,35 @@
                                     <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 class="sizeritem">
+                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxStaticText">
+                                    <label>wxCommandLinkButton:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_CENTRE|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxCommandLinkButton">
+                                    <label>Let's do it</label>
+                                    <note>Whatever it might be</note>
+                                </object>
+                            </object>
                         </object>
                     </object>
                 </object>
@@ -891,7 +935,7 @@
                                 <flag>wxALIGN_CENTRE|wxALL</flag>
                                 <border>5</border>
                                 <object class="wxStaticBitmap" name="controls_staticbitmap">
-                                    <bitmap>appicon.xpm</bitmap>
+                                    <bitmap>stop.xpm</bitmap>
                                 </object>
                             </object>
                         </object>