X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..f92099657f465d782a8e32444d59f8ebdbdce182:/samples/xrc/rc/controls.xrc

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index b50afb8112..c0a2edf37a 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -54,6 +54,68 @@
                     </object>
                 </object>
 
+                <object class="choicebookpage">
+                    <label>wxBannerWindow</label>
+                    <object class="wxPanel" name="bannerwindow">
+                        <object class="wxBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+
+                            <object class="sizeritem">
+                                <flag>wxEXPAND</flag>
+                                <object class="wxBannerWindow">
+                                    <title>Welcome to banner demo page!</title>
+                                    <message>This is a default wxLEFT banner with some text.\nThe banner on the top uses a bitmap.</message>
+                                </object>
+                            </object>
+
+                            <object class="sizeritem">
+                                <flag>wxEXPAND|wxLEFT|wxRIGHT</flag>
+                                <option>1</option>
+                                <border>15</border>
+                                <object class="wxBoxSizer">
+                                    <orient>wxVERTICAL</orient>
+
+                                    <object class="sizeritem">
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxBannerWindow">
+                                            <direction>wxTOP</direction>
+                                            <bitmap>wxbanner.gif</bitmap>
+                                            <fg>yellow</fg>
+                                            <!-- Using spaces for indentation is ugly but will do for this simple example. -->
+                                            <title>                                                                                               Tip:</title>
+                                            <message>                                                                                                 You can also use text\n                                                                                                 and bitmap together.</message>
+                                        </object>
+                                    </object>
+
+                                    <object class="spacer">
+                                        <option>1</option>
+                                    </object>
+
+                                    <object class="sizeritem">
+                                        <flag>wxEXPAND</flag>
+                                        <object class="wxBannerWindow">
+                                            <direction>wxBOTTOM</direction>
+                                            <title>A word of advice:</title>
+                                            <message>You probably shouldn't use banners\non all four sides at once.</message>
+                                        </object>
+                                    </object>
+                                </object>
+                            </object>
+
+                            <object class="sizeritem">
+                                <flag>wxEXPAND</flag>
+                                <object class="wxBannerWindow">
+                                    <direction>wxRIGHT</direction>
+                                    <title>Custom Banner</title>
+                                    <message>You can change the gradient colours.</message>
+                                    <gradient-start>#7f7f7f</gradient-start>
+                                    <gradient-end>#ffffff</gradient-end>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+
                 <object class="choicebookpage">
                     <label>wxButton</label>
                     <object class="wxPanel" name="button">
@@ -683,6 +745,51 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
+                <object class="choicebookpage">
+                    <label>wxRibbonBar</label>
+                    <object class="wxRibbonBar" name="ribbonbar">
+                        <object class="page" name="RibbonPage1">
+                            <label>First</label>
+                            <object class="panel">
+                                <label>Applicative stuff</label>
+                                <object class="wxRibbonButtonBar">
+                                    <object class="button" name="App">
+                                        <bitmap>derivdlg.xpm</bitmap>
+                                        <label>Derived</label>
+                                    </object>
+                                    <object class="button" name="App2">
+                                        <bitmap>basicdlg.xpm</bitmap>
+                                        <label>Basic</label>
+                                    </object>
+                                    <object class="button" name="App3">
+                                        <bitmap>custclas.xpm</bitmap>
+                                        <label>Custom</label>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                        <object class="page" name="RibbonPage2">
+                            <label>Second page</label>
+                            <object class="panel">
+                                <label>Gallery test</label>
+                                <object class="wxRibbonGallery">
+                                    <object class="item">
+                                        <bitmap>derivdlg.xpm</bitmap>
+                                    </object>
+                                    <object class="item">
+                                        <bitmap>basicdlg.xpm</bitmap>
+                                    </object>
+                                    <object class="item">
+                                        <bitmap>custclas.xpm</bitmap>
+                                    </object>
+                                    <object class="item">
+                                        <bitmap>artprov.xpm</bitmap>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
                 <object class="choicebookpage">
                     <label>wxScrollBar</label>
                     <object class="wxPanel" name="scrollbar">
@@ -792,7 +899,8 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                 <object class="wxSpinCtrl" name="controls_spinctrl">
                                     <size>100,-1</size>
                                     <max>100</max>
-                                    <value>0</value>
+                                    <value>17</value>
+                                    <base>16</base>
                                 </object>
                             </object>
                         </object>
@@ -871,18 +979,63 @@ lay them out using wxSizers, absolute positioning, everything you like!
                 <object class="choicebookpage">
                     <label>wxStaticText</label>
                     <object class="wxPanel" name="statictext">
+                        <font>
+                            <size>12</size>
+                        </font>
                         <object class="wxFlexGridSizer">
-                            <cols>1</cols>
+                            <cols>2</cols>
                             <rows>0</rows>
                             <vgap>0</vgap>
                             <hgap>0</hgap>
-                            <growablecols>0</growablecols>
-                            <growablerows>0</growablerows>
+                            <growablecols>0,1</growablecols>
+                            <growablerows>0,1,2</growablerows>
                             <object class="sizeritem">
-                                <flag>wxALIGN_CENTRE|wxALL</flag>
+                                <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxStaticText" name="wxID_STATIC">
+                                    <label>Default font:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                                <border>5</border>
+                                <object class="wxStaticText" name="controls_statictext">
+                                    <label>It was a dark and stormy night.</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxStaticText" name="wxID_STATIC">
+                                    <label>Default constructed bold font:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                                <border>5</border>
+                                <object class="wxStaticText" name="controls_statictext">
+                                    <label>It was a dark and stormy night.</label>
+                                    <font>
+                                      <weight>bold</weight>
+                                    </font>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxStaticText" name="wxID_STATIC">
+                                    <label>Inheritance constructed bold font:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
                                 <border>5</border>
                                 <object class="wxStaticText" name="controls_statictext">
                                     <label>It was a dark and stormy night.</label>
+                                    <font>
+                                      <inherit>1</inherit>
+                                      <weight>bold</weight>
+                                    </font>
                                 </object>
                             </object>
                         </object>