Check axis number in the received joystick messages.

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

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index f0ad8ffac1137ce9f464e1a23e2469c6447f3fb0..c0a2edf37a2670a69ad4490cf465a692ad1ef016 100644 (file)
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -745,6 +745,51 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
                         </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">
                 <object class="choicebookpage">
                     <label>wxScrollBar</label>
                     <object class="wxPanel" name="scrollbar">


@@ -854,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>
                                 <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>
                                 </object>
                             </object>
                         </object>


@@ -933,18 +979,63 @@ lay them out using wxSizers, absolute positioning, everything you like!
                 <object class="choicebookpage">
                     <label>wxStaticText</label>
                     <object class="wxPanel" name="statictext">
                 <object class="choicebookpage">
                     <label>wxStaticText</label>
                     <object class="wxPanel" name="statictext">

+                        <font>
+                            <size>12</size>
+                        </font>

                         <object class="wxFlexGridSizer">
                         <object class="wxFlexGridSizer">

-                            <cols>1</cols>
+                            <cols>2</cols>

                             <rows>0</rows>
                             <vgap>0</vgap>
                             <hgap>0</hgap>
                             <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">
                             <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>
                                 <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>
                                 </object>
                             </object>
                         </object>