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

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index 83b5da400c..c0a2edf37a 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -19,11 +19,10 @@
         <object class="sizeritem">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
             <border>5</border>
-            <object class="wxNotebook" name="controls_notebook">
-                <usenotebooksizer>1</usenotebooksizer>
+            <object class="wxChoicebook" name="controls_book">
                 <size>550,250</size>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxAnimationCtrl</label>
                     <object class="wxPanel" name="animctrl">
                         <object class="wxFlexGridSizer">
@@ -55,7 +54,69 @@
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <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">
                         <object class="wxFlexGridSizer">
@@ -126,7 +187,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxCalendarControl</label>
                     <object class="wxPanel" name="calendar">
                         <object class="wxFlexGridSizer">
@@ -146,7 +207,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxCheckBox</label>
                     <object class="wxPanel" name="checkbox">
                         <object class="wxFlexGridSizer">
@@ -174,7 +235,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxCheckListBox</label>
                     <object class="wxPanel" name="checklist">
                         <object class="wxFlexGridSizer">
@@ -202,7 +263,7 @@
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxChoice</label>
                     <object class="wxPanel" name="choice">
                         <object class="wxFlexGridSizer">
@@ -231,7 +292,7 @@
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxCollapsiblePane</label>
                     <object class="wxPanel" name="collpane">
                         <object class="wxFlexGridSizer">
@@ -279,7 +340,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxComboBox</label>
                     <object class="wxPanel" name="combobox">
                         <object class="wxFlexGridSizer">
@@ -333,7 +394,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxGauge</label>
                     <object class="wxPanel" name="gauge">
                         <object class="wxFlexGridSizer">
@@ -380,7 +441,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxFile/DirCtrl</label>
                     <object class="wxPanel" name="genericdirctrl">
                         <object class="wxFlexGridSizer">
@@ -417,7 +478,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxHtmlWindow</label>
                     <object class="wxPanel" name="htmlwindow">
                         <object class="wxFlexGridSizer">
@@ -446,7 +507,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxListBox</label>
                     <object class="wxPanel" name="listbox">
                         <object class="wxFlexGridSizer">
@@ -474,7 +535,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxSimpleHtmlListBox</label>
                     <object class="wxPanel" name="simplehtmllistbox">
                         <object class="wxFlexGridSizer">
@@ -502,7 +563,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxListCtrl</label>
                     <object class="wxPanel" name="listctrl">
                         <object class="wxBoxSizer">
@@ -512,14 +573,25 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                 <object class="wxListCtrl" name="controls_listctrl">
                                     <size>220,160</size>
                                     <style>wxLC_REPORT|wxBORDER_SIMPLE</style>
+                                    <imagelist-small>
+                                        <size>16,16</size>
+                                        <bitmap stock_id="wxART_HELP_BOOK"/>
+                                        <bitmap stock_id="wxART_INFORMATION"/>
+                                        <bitmap stock_id="wxART_GO_UP"/>
+                                        <bitmap stock_id="wxART_PLUS"/>
+                                        <bitmap stock_id="wxART_GO_DOWN"/>
+                                        <bitmap stock_id="wxART_WARNING"/>
+                                    </imagelist-small>
                                     <object class="listcol">
                                         <text>Name</text>
-                                        <width>150</width>
+                                        <width>105</width>
+                                        <image>0</image>
                                     </object>
                                     <object class="listcol">
                                         <text>Weight</text>
                                         <align>wxLIST_FORMAT_RIGHT</align>
-                                        <width>50</width>
+                                        <width>105</width>
+                                        <image>1</image>
                                     </object>
                                     <!-- the items are added from the code -->
                                 </object>
@@ -564,7 +636,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxPanel</label>
                     <object class="wxPanel" name="panel">
                         <object class="wxFlexGridSizer">
@@ -585,7 +657,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxSplitterWindow</label>
                     <object class="wxPanel" name="panel">
                         <object class="wxFlexGridSizer">
@@ -613,7 +685,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxRadioButton</label>
                     <object class="wxPanel" name="radiobutton">
                         <object class="wxFlexGridSizer">
@@ -641,7 +713,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxRadioBox</label>
                     <object class="wxPanel" name="radiobox">
                         <object class="wxFlexGridSizer">
@@ -673,7 +745,52 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <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="wxFlexGridSizer">
@@ -697,7 +814,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxSlider</label>
                     <object class="wxPanel" name="slider">
                         <object class="wxFlexGridSizer">
@@ -744,7 +861,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxSpinButton</label>
                     <object class="wxPanel" name="spinbutton">
                         <object class="wxFlexGridSizer">
@@ -766,7 +883,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxSpinCtrl</label>
                     <object class="wxPanel" name="spinctrl">
                         <object class="wxFlexGridSizer">
@@ -782,13 +899,14 @@ 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>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxStaticBitmap</label>
                     <object class="wxPanel" name="staticbitmap">
                         <object class="wxFlexGridSizer">
@@ -808,7 +926,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxStaticBox</label>
                     <object class="wxPanel" name="staticbox">
                         <object class="wxFlexGridSizer">
@@ -829,7 +947,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxStaticLine</label>
                     <object class="wxPanel" name="staticline">
                         <object class="wxFlexGridSizer">
@@ -858,27 +976,72 @@ lay them out using wxSizers, absolute positioning, everything you like!
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <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>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxTextCtrl</label>
                     <object class="wxPanel" name="textctrl">
                         <object class="wxFlexGridSizer">
@@ -954,7 +1117,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxToolBar</label>
                     <object class="wxPanel" name="button">
                         <object class="wxFlexGridSizer">
@@ -1098,7 +1261,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxToolbook</label>
                     <object class="wxToolbook" name="controls_toolbook">
                     <style>wxTBK_HORZ_LAYOUT</style>
@@ -1132,14 +1295,23 @@ lay them out using wxSizers, absolute positioning, everything you like!
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxTreebook</label>
                                 <object class="wxTreebook" name="controls_treebook">
                                     <size>350,280</size>
                                     <style>wxSUNKEN_BORDER</style>
+                                    <imagelist>
+                                        <size>16,16</size>
+                                        <bitmap stock_id="wxART_HELP_BOOK"/>
+                                        <bitmap stock_id="wxART_QUESTION"/>
+                                        <bitmap stock_id="wxART_INFORMATION"/>
+                                        <bitmap stock_id="wxART_GO_HOME"/>
+                                    </imagelist>
                                     <object class="treebookpage">
                                         <label>Page 1</label>
                                         <depth>0</depth>
+                                        <image>0</image>
+                                        <expanded>1</expanded>
                                         <object class="wxButton" name="controls_treebook_button1">
                                             <size>200,180</size>
                                             <label>Button N1</label>
@@ -1148,10 +1320,13 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                     <object class="treebookpage">
                                         <label>Empty Page 2</label>
                                         <depth>1</depth>
+                                        <image>1</image>
+                                        <expanded>1</expanded>
                                     </object>
                                     <object class="treebookpage">
                                         <label>Page 3</label>
                                         <depth>2</depth>
+                                        <image>2</image>
                                         <object class="wxButton" name="controls_treebook_button3">
                                             <size>200,180</size>
                                             <label>Button N3</label>
@@ -1160,6 +1335,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                     <object class="treebookpage">
                                         <label>Page 4</label>
                                         <depth>1</depth>
+                                        <image>3</image>
                                         <object class="wxButton" name="controls_treebook_button4">
                                             <size>200,180</size>
                                             <label>Button N4</label>
@@ -1168,7 +1344,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                 </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxTreeCtrl</label>
                     <object class="wxPanel" name="treectrl">
                         <object class="wxFlexGridSizer">
@@ -1190,7 +1366,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wx*PickerCtrl</label>
                     <object class="wxPanel" name="pickers">
                         <object class="wxFlexGridSizer">
@@ -1274,7 +1450,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>The Rest</label>
                     <object class="wxPanel" name="Rest">
                         <object class="wxFlexGridSizer">
@@ -1308,8 +1484,8 @@ lay them out using wxSizers, absolute positioning, everything you like!
                             <object class="sizeritem">
                                 <flag>wxALIGN_CENTRE|wxALL</flag>
                                 <border>5</border>
-                                <object class="wxStaticText" name="controls_notebook_statictextT">
-                                    <label>wxNotebook (This dialog uses one)</label>
+                                <object class="wxStaticText" name="controls_notebook_statictext">
+                                    <label>wxBookCtrl (This dialog uses wxChoicebook)</label>
                                 </object>
                             </object>
                             <object class="sizeritem">