X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8758875e0b001444cb677906e68912cb455ab275..ecc8721a0af85f0e2574bb81a6391dd71822a051:/samples/xrc/rc/controls.xrc

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index 909bbef433..f0ad8ffac1 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -19,226 +19,108 @@
         <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">
-                    <label>wxTreebook</label>
-                                <object class="wxTreebook" name="controls_treebook">
-                                    <size>350,280</size>
-                                    <style>wxSUNKEN_BORDER</style>
-                                    <object class="treebookpage">
-                                        <label>Page 1</label>
-                                        <depth>0</depth>
-                                        <object class="wxButton" name="controls_treebook_button1">
-                                            <size>200,180</size>
-                                            <label>Button N1</label>
-                                        </object>
-                                    </object>
-                                    <object class="treebookpage">
-                                        <label>Empty Page 2</label>
-                                        <depth>1</depth>
-                                    </object>
-                                    <object class="treebookpage">
-                                        <label>Page 3</label>
-                                        <depth>2</depth>
-                                        <object class="wxButton" name="controls_treebook_button3">
-                                            <size>200,180</size>
-                                            <label>Button N3</label>
-                                        </object>
-                                    </object>
-                                    <object class="treebookpage">
-                                        <label>Page 4</label>
-                                        <depth>1</depth>
-                                        <object class="wxButton" name="controls_treebook_button4">
-                                            <size>200,180</size>
-                                            <label>Button N4</label>
-                                        </object>
-                                    </object>
-                                </object>
-                </object>
-                <object class="notebookpage">
-                    <label>wxToolBar</label>
-                    <object class="wxPanel" name="button">
+
+                <object class="choicebookpage">
+                    <label>wxAnimationCtrl</label>
+                    <object class="wxPanel" name="animctrl">
                         <object class="wxFlexGridSizer">
                             <cols>2</cols>
-                            <rows>0</rows>
+                            <rows>1</rows>
                             <vgap>0</vgap>
                             <hgap>0</hgap>
                             <growablecols>0,1</growablecols>
-                            <growablerows>0,1</growablerows>
+                            <growablerows>0</growablerows>
+
                             <object class="sizeritem">
-                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                                <flag>wxALIGN_CENTRE|wxALL</flag>
                                 <border>5</border>
-                                <object class="wxStaticText" name="controls_normal_button">
-                                    <label>Transparent background:</label>
+                                <object class="wxButton" name="controls_animation_button_play">
+                                    <label>Play</label>
                                 </object>
                             </object>
+
                             <object class="sizeritem">
-                                <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                                <flag>wxALIGN_CENTRE|wxALL</flag>
                                 <border>5</border>
-                                <size>300,60</size>
-                                <object class="wxToolBar">
-                                    <style>wxTB_FLAT|wxTB_NODIVIDER</style>
-                                    <margins>2,2</margins>
-                                    <object class="tool" name="non_derived_dialog_tool_or_menuitem">
-                                        <tooltip>Non-Derived Dialog Example</tooltip>
-                                        <bitmap>basicdlg.xpm</bitmap>
-                                        <longhelp>The basic instance of wxDialog loaded via XRC</longhelp>
-                                    </object>
-                                    <object class="tool" name="derived_tool_or_menuitem">
-                                        <tooltip>Derived Dialog Example</tooltip>
-                                        <bitmap>derivdlg.xpm</bitmap>
-                                        <longhelp>The most important example: load an XRC for a derived dialog</longhelp>
-                                    </object>
-                                    <object class="tool" name="controls_tool_or_menuitem">
-                                        <tooltip>Controls Example</tooltip>
-                                        <bitmap>controls.xpm</bitmap>
-                                        <longhelp>A notebook displaying all the wxWidgets controls</longhelp>
-                                    </object>
-                                    <object class="tool" name="uncentered_tool_or_menuitem">
-                                        <tooltip>Uncentered Example</tooltip>
-                                        <bitmap>uncenter.xpm</bitmap>
-                                        <longhelp>Disable autocentering of a dialog on its parent</longhelp>
-                                    </object>
-                                    <separator/>
-                                     <object class="tool" name="custom_class_tool_or_menuitem">
-                                        <tooltip>Custom Class Example</tooltip>
-                                        <bitmap>custclas.xpm</bitmap>
-                                        <longhelp>Embed your own custom classes into an XRC</longhelp>
-                                    </object>
-                                    <object class="tool" name="platform_property_tool_or_menuitem">
-                                        <tooltip>Platform Specific Example</tooltip>
-                                        <bitmap>platform.xpm</bitmap>
-                                        <longhelp>Customize parts of an interface for a desired platform</longhelp>
-                                    </object>
-                                    <object class="tool" name="art_provider_tool_or_menuitem">
-                                        <tooltip>wxArtProvider Example</tooltip>
-                                        <bitmap>artprov.xpm</bitmap>
-                                        <longhelp>Use wxArtProvider to insert desired icons at runtime</longhelp>
-                                    </object>
-                                    <object class="tool" name="variable_expansion_tool_or_menuitem">
-                                        <tooltip>Variable Expansion Example</tooltip>
-                                        <bitmap>variable.xpm</bitmap>
-                                        <longhelp>Replace variables in the XRC file at runtime</longhelp>
-                                    </object>
-                                    <object class="wxComboBox">
-                                        <content>
-                                            <item>Just</item>
-                                            <item>a combobox</item>
-                                            <item>in the toolbar</item>
-                                        </content>
-                                    </object>
-                                    <object class="wxOwnerDrawnComboBox">
-                                        <content>
-                                            <item>Owner Drawn</item>
-                                            <item>combobox</item>
-                                            <item>in the toolbar</item>
-                                        </content>
-                                    </object>
+                                <object class="wxAnimationCtrl" name="controls_animation_ctrl">
+                                    <animation>throbber.gif</animation>
+                                    <inactive-bitmap>stop.xpm</inactive-bitmap>
                                 </object>
                             </object>
+
+                        </object>
+                    </object>
+                </object>
+
+                <object class="choicebookpage">
+                    <label>wxBannerWindow</label>
+                    <object class="wxPanel" name="bannerwindow">
+                        <object class="wxBoxSizer">
+                            <orient>wxHORIZONTAL</orient>
+
                             <object class="sizeritem">
-                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
-                                <border>5</border>
-                                <object class="wxStaticText" name="controls_statictext2_button">
-                                    <label>Fixed color background:</label>
+                                <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>wxALIGN_CENTER_VERTICAL|wxALL</flag>
-                                <border>5</border>
-                                <object class="wxToolBar">
-                                    <style>wxTB_FLAT|wxTB_NODIVIDER</style>
-                                    <bg>#bbbbff</bg>
-                                    <margins>2,2</margins>
-                                    <object class="tool" name="non_derived_dialog_tool_or_menuitem">
-                                        <tooltip>Non-Derived Dialog Example</tooltip>
-                                        <bitmap>basicdlg.xpm</bitmap>
-                                        <longhelp>The basic instance of wxDialog loaded via XRC</longhelp>
-                                    </object>
-                                    <object class="tool" name="derived_tool_or_menuitem">
-                                        <tooltip>Derived Dialog Example</tooltip>
-                                        <bitmap>derivdlg.xpm</bitmap>
-                                        <longhelp>The most important example: load an XRC for a derived dialog</longhelp>
-                                    </object>
-                                    <object class="tool" name="controls_tool_or_menuitem">
-                                        <tooltip>Controls Example</tooltip>
-                                        <bitmap>controls.xpm</bitmap>
-                                        <longhelp>A notebook displaying all the wxWidgets controls</longhelp>
-                                    </object>
-                                    <object class="tool" name="uncentered_tool_or_menuitem">
-                                        <tooltip>Uncentered Example</tooltip>
-                                        <bitmap>uncenter.xpm</bitmap>
-                                        <longhelp>Disable autocentering of a dialog on its parent</longhelp>
-                                    </object>
-                                    <separator/>
-                                     <object class="tool" name="custom_class_tool_or_menuitem">
-                                        <tooltip>Custom Class Example</tooltip>
-                                        <bitmap>custclas.xpm</bitmap>
-                                        <longhelp>Embed your own custom classes into an XRC</longhelp>
-                                    </object>
-                                    <object class="tool" name="platform_property_tool_or_menuitem">
-                                        <tooltip>Platform Specific Example</tooltip>
-                                        <bitmap>platform.xpm</bitmap>
-                                        <longhelp>Customize parts of an interface for a desired platform</longhelp>
-                                    </object>
-                                    <object class="tool" name="art_provider_tool_or_menuitem">
-                                        <tooltip>wxArtProvider Example</tooltip>
-                                        <bitmap>artprov.xpm</bitmap>
-                                        <longhelp>Use wxArtProvider to insert desired icons at runtime</longhelp>
-                                    </object>
-                                    <object class="tool" name="variable_expansion_tool_or_menuitem">
-                                        <tooltip>Variable Expansion Example</tooltip>
-                                        <bitmap>variable.xpm</bitmap>
-                                        <longhelp>Replace variables in the XRC file at runtime</longhelp>
+                                <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="wxComboBox">
-                                        <content>
-                                            <item>Just</item>
-                                            <item>a combobox</item>
-                                            <item>in the toolbar</item>
-                                        </content>
+
+                                    <object class="spacer">
+                                        <option>1</option>
                                     </object>
-                                    <object class="wxOwnerDrawnComboBox">
-                                        <content>
-                                            <item>Owner Drawn</item>
-                                            <item>combobox</item>
-                                            <item>in the toolbar</item>
-                                        </content>
+
+                                    <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>
-                    </object>
-                </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>
+                                <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="notebookpage">
+
+                <object class="choicebookpage">
                     <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>
@@ -273,10 +155,39 @@
                                     <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>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxCalendarControl</label>
                     <object class="wxPanel" name="calendar">
                         <object class="wxFlexGridSizer">
@@ -296,7 +207,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxCheckBox</label>
                     <object class="wxPanel" name="checkbox">
                         <object class="wxFlexGridSizer">
@@ -324,7 +235,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxCheckListBox</label>
                     <object class="wxPanel" name="checklist">
                         <object class="wxFlexGridSizer">
@@ -352,7 +263,7 @@
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxChoice</label>
                     <object class="wxPanel" name="choice">
                         <object class="wxFlexGridSizer">
@@ -380,7 +291,56 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+
+                <object class="choicebookpage">
+                    <label>wxCollapsiblePane</label>
+                    <object class="wxPanel" name="collpane">
+                        <object class="wxFlexGridSizer">
+                            <cols>1</cols>
+                            <rows>1</rows>
+                            <vgap>0</vgap>
+                            <hgap>0</hgap>
+                            <growablecols>0</growablecols>
+                            <growablerows>0</growablerows>
+
+                            <object class="sizeritem">
+                                <flag>wxGROW|wxALL</flag>
+                                <border>5</border>
+                                <option>1</option>
+                                <object class="wxCollapsiblePane" name="controls_collpane">
+                                    <label>Details:</label>
+                                    <collapsed>0</collapsed>
+                                    <object class="panewindow">
+
+                                        <object class="wxFlexGridSizer">
+                                            <cols>1</cols>
+                                            <rows>1</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="wxStaticText" name="controls_dialog_statictext">
+                                                    <label>
+Inside a wxCollapsiblePane you can put everything you want and
+lay them out using wxSizers, absolute positioning, everything you like!
+                                                    </label>
+                                                </object>
+                                            </object>
+                                        </object>
+
+                                    </object>
+                                </object>
+                            </object>
+
+                        </object>
+                    </object>
+                </object>
+
+                <object class="choicebookpage">
                     <label>wxComboBox</label>
                     <object class="wxPanel" name="combobox">
                         <object class="wxFlexGridSizer">
@@ -414,27 +374,27 @@
                                     <style>wxCB_READONLY</style>
                                     <selection>2</selection>
                                     <object class="ownerdrawnitem">
-										<text>This is a</text>
-										<bitmap>basicdlg.xpm</bitmap>
-									 </object>
+                                        <text>This is a</text>
+                                        <bitmap>basicdlg.xpm</bitmap>
+                                     </object>
                                     <object class="ownerdrawnitem">
-										<text>read-only</text>
-										<bitmap>derivdlg.xpm</bitmap>
-									 </object>
+                                        <text>read-only</text>
+                                        <bitmap>derivdlg.xpm</bitmap>
+                                     </object>
                                     <object class="ownerdrawnitem">
-										<text>wxBitmapComboBox</text>
-										<bitmap>uncenter.xpm</bitmap>
-									 </object>
+                                        <text>wxBitmapComboBox</text>
+                                        <bitmap>uncenter.xpm</bitmap>
+                                     </object>
                                     <object class="ownerdrawnitem">
-										<text>control</text>
-										<bitmap>custclas.xpm</bitmap>
-									</object>
+                                        <text>control</text>
+                                        <bitmap>custclas.xpm</bitmap>
+                                    </object>
                                 </object>
                             </object>
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxGauge</label>
                     <object class="wxPanel" name="gauge">
                         <object class="wxFlexGridSizer">
@@ -481,16 +441,26 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
-                    <label>wxGenericDirCtrl</label>
+                <object class="choicebookpage">
+                    <label>wxFile/DirCtrl</label>
                     <object class="wxPanel" name="genericdirctrl">
                         <object class="wxFlexGridSizer">
-                            <cols>1</cols>
-                            <rows>0</rows>
-                            <vgap>0</vgap>
-                            <hgap>0</hgap>
-                            <growablecols>0</growablecols>
-                            <growablerows>0</growablerows>
+                            <cols>2</cols>
+                            <growablecols>1</growablecols>
+                            <growablerows>1</growablerows>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_CENTRE|wxALL</flag>
+                                <object class="wxStaticText">
+                                    <label>wxGenericDirCtrl</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_CENTRE|wxALL</flag>
+                                <object class="wxStaticText">
+                                    <label>wxFileCtrl</label>
+                                </object>
+                            </object>
+
                             <object class="sizeritem">
                                 <flag>wxALIGN_CENTRE|wxALL</flag>
                                 <border>5</border>
@@ -498,10 +468,17 @@
                                     <size>200,200</size>
                                 </object>
                             </object>
+                            <object class="sizeritem">
+                                <flag>wxEXPAND|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxFileCtrl">
+                                    <wildcard>Text files (*.txt)</wildcard>
+                                </object>
+                            </object>
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxHtmlWindow</label>
                     <object class="wxPanel" name="htmlwindow">
                         <object class="wxFlexGridSizer">
@@ -530,7 +507,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxListBox</label>
                     <object class="wxPanel" name="listbox">
                         <object class="wxFlexGridSizer">
@@ -558,7 +535,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxSimpleHtmlListBox</label>
                     <object class="wxPanel" name="simplehtmllistbox">
                         <object class="wxFlexGridSizer">
@@ -586,28 +563,80 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxListCtrl</label>
                     <object class="wxPanel" name="listctrl">
-                        <object class="wxFlexGridSizer">
-                            <cols>1</cols>
-                            <rows>0</rows>
-                            <vgap>0</vgap>
-                            <hgap>0</hgap>
-                            <growablecols>0</growablecols>
-                            <growablerows>0</growablerows>
+                        <object class="wxBoxSizer">
                             <object class="sizeritem">
                                 <flag>wxALIGN_CENTER|wxALL</flag>
                                 <border>5</border>
                                 <object class="wxListCtrl" name="controls_listctrl">
                                     <size>220,160</size>
-                                    <style>wxLC_REPORT|wxSUNKEN_BORDER</style>
+                                    <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>105</width>
+                                        <image>0</image>
+                                    </object>
+                                    <object class="listcol">
+                                        <text>Weight</text>
+                                        <align>wxLIST_FORMAT_RIGHT</align>
+                                        <width>105</width>
+                                        <image>1</image>
+                                    </object>
+                                    <!-- the items are added from the code -->
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_CENTER|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxListCtrl" name="controls_listctrl2">
+                                    <size>220,160</size>
+                                    <style>wxLC_ICON|wxBORDER_SIMPLE</style>
+                                    <object class="listitem">
+                                        <text>Information</text>
+                                        <bitmap stock_id="wxART_INFORMATION"/>
+                                    </object>
+                                    <object class="listitem">
+                                        <text>Question?</text>
+                                        <bitmap stock_id="wxART_QUESTION"/>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_CENTER|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxListCtrl" name="controls_listctrl3">
+                                    <size>220,160</size>
+                                    <style>wxLC_SMALL_ICON|wxBORDER_SIMPLE</style>
+                                    <imagelist-small>
+                                        <size>20,20</size>
+                                        <bitmap stock_id="wxART_INFORMATION"/>
+                                        <bitmap stock_id="wxART_QUESTION"/>
+                                    </imagelist-small>
+                                    <object class="listitem">
+                                        <text>Information</text>
+                                        <image-small>0</image-small>
+                                    </object>
+                                    <object class="listitem">
+                                        <text>Question?</text>
+                                        <image-small>1</image-small>
+                                    </object>
                                 </object>
                             </object>
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxPanel</label>
                     <object class="wxPanel" name="panel">
                         <object class="wxFlexGridSizer">
@@ -628,7 +657,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxSplitterWindow</label>
                     <object class="wxPanel" name="panel">
                         <object class="wxFlexGridSizer">
@@ -656,7 +685,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxRadioButton</label>
                     <object class="wxPanel" name="radiobutton">
                         <object class="wxFlexGridSizer">
@@ -684,7 +713,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxRadioBox</label>
                     <object class="wxPanel" name="radiobox">
                         <object class="wxFlexGridSizer">
@@ -716,7 +745,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxScrollBar</label>
                     <object class="wxPanel" name="scrollbar">
                         <object class="wxFlexGridSizer">
@@ -740,7 +769,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxSlider</label>
                     <object class="wxPanel" name="slider">
                         <object class="wxFlexGridSizer">
@@ -787,7 +816,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxSpinButton</label>
                     <object class="wxPanel" name="spinbutton">
                         <object class="wxFlexGridSizer">
@@ -809,7 +838,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxSpinCtrl</label>
                     <object class="wxPanel" name="spinctrl">
                         <object class="wxFlexGridSizer">
@@ -831,7 +860,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxStaticBitmap</label>
                     <object class="wxPanel" name="staticbitmap">
                         <object class="wxFlexGridSizer">
@@ -845,13 +874,13 @@
                                 <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>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxStaticBox</label>
                     <object class="wxPanel" name="staticbox">
                         <object class="wxFlexGridSizer">
@@ -872,7 +901,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxStaticLine</label>
                     <object class="wxPanel" name="staticline">
                         <object class="wxFlexGridSizer">
@@ -901,7 +930,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxStaticText</label>
                     <object class="wxPanel" name="statictext">
                         <object class="wxFlexGridSizer">
@@ -921,7 +950,7 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wxTextCtrl</label>
                     <object class="wxPanel" name="textctrl">
                         <object class="wxFlexGridSizer">
@@ -996,7 +1025,235 @@
                         </object>
                     </object>
                 </object>
-                <object class="notebookpage">
+
+                <object class="choicebookpage">
+                    <label>wxToolBar</label>
+                    <object class="wxPanel" name="button">
+                        <object class="wxFlexGridSizer">
+                            <cols>2</cols>
+                            <rows>0</rows>
+                            <vgap>0</vgap>
+                            <hgap>0</hgap>
+                            <growablecols>1</growablecols>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxStaticText" name="controls_normal_button">
+                                    <label>Transparent background:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxEXPAND|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxToolBar">
+                                    <style>wxTB_FLAT|wxTB_NODIVIDER</style>
+                                    <margins>2,2</margins>
+                                    <object class="tool" name="New">
+                                        <bitmap stock_id="wxART_NEW"/>
+                                        <label>New</label>
+                                    </object>
+                                    <object class="tool" name="view_auto">
+                                        <bitmap stock_id="wxART_FILE_OPEN"/>
+                                        <label>View</label>
+                                        <dropdown>
+                                            <object class="wxMenu">
+                                                <object class="wxMenuItem" name="view_as_text">
+                                                    <label>View as text</label>
+                                                </object>
+                                                <object class="wxMenuItem" name="view_as_hex">
+                                                    <label>View as binary</label>
+                                                </object>
+                                            </object>
+                                        </dropdown>
+                                    </object>
+                                    <object class="separator"/>
+                                    <object class="tool" name="home">
+                                        <toggle>1</toggle>
+                                        <bitmap stock_id="wxART_GO_HOME"/>
+                                        <label>Home</label>
+                                    </object>
+                                    <object class="separator"/>
+                                    <object class="tool" name="up">
+                                        <radio>1</radio>
+                                        <bitmap stock_id="wxART_GO_UP"/>
+                                        <label>Up</label>
+                                    </object>
+                                    <object class="tool" name="down">
+                                        <radio>1</radio>
+                                        <bitmap stock_id="wxART_GO_DOWN"/>
+                                        <label>Down</label>
+                                    </object>
+                                    <object class="space"/>
+                                    <object class="wxComboBox">
+                                        <content>
+                                            <item>Just</item>
+                                            <item>a combobox</item>
+                                            <item>in the toolbar</item>
+                                        </content>
+                                    </object>
+                                    <object class="wxOwnerDrawnComboBox">
+                                        <content>
+                                            <item>Owner Drawn</item>
+                                            <item>combobox</item>
+                                            <item>in the toolbar</item>
+                                        </content>
+                                    </object>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxStaticText" name="controls_statictext2_button">
+                                    <label>Fixed color background:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxEXPAND|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxToolBar">
+                                    <style>wxTB_FLAT|wxTB_NODIVIDER</style>
+                                    <bg>#bbbbff</bg>
+                                    <margins>2,2</margins>
+                                    <object class="tool" name="New">
+                                        <bitmap stock_id="wxART_NEW"/>
+                                        <label>New</label>
+                                    </object>
+                                    <object class="tool" name="view_auto">
+                                        <bitmap stock_id="wxART_FILE_OPEN"/>
+                                        <label>View</label>
+                                        <dropdown>
+                                            <object class="wxMenu">
+                                                <object class="wxMenuItem" name="view_as_text">
+                                                    <label>View as text</label>
+                                                </object>
+                                                <object class="wxMenuItem" name="view_as_hex">
+                                                    <label>View as binary</label>
+                                                </object>
+                                            </object>
+                                        </dropdown>
+                                    </object>
+                                    <object class="separator"/>
+                                    <object class="tool" name="home">
+                                        <toggle>1</toggle>
+                                        <bitmap stock_id="wxART_GO_HOME"/>
+                                        <label>Home</label>
+                                    </object>
+                                    <object class="separator"/>
+                                    <object class="tool" name="up">
+                                        <radio>1</radio>
+                                        <bitmap stock_id="wxART_GO_UP"/>
+                                        <label>Up</label>
+                                    </object>
+                                    <object class="tool" name="down">
+                                        <radio>1</radio>
+                                        <bitmap stock_id="wxART_GO_DOWN"/>
+                                        <label>Down</label>
+                                    </object>
+                                    <object class="space"/>
+                                    <object class="wxComboBox">
+                                        <content>
+                                            <item>Just</item>
+                                            <item>a combobox</item>
+                                            <item>in the toolbar</item>
+                                        </content>
+                                    </object>
+                                    <object class="wxOwnerDrawnComboBox">
+                                        <content>
+                                            <item>Owner Drawn</item>
+                                            <item>combobox</item>
+                                            <item>in the toolbar</item>
+                                        </content>
+                                    </object>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+
+                <object class="choicebookpage">
+                    <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="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>
+                                        </object>
+                                    </object>
+                                    <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>
+                                        </object>
+                                    </object>
+                                    <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>
+                                        </object>
+                                    </object>
+                                </object>
+                </object>
+
+                <object class="choicebookpage">
                     <label>wxTreeCtrl</label>
                     <object class="wxPanel" name="treectrl">
                         <object class="wxFlexGridSizer">
@@ -1018,7 +1275,7 @@
                     </object>
                 </object>
 
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>wx*PickerCtrl</label>
                     <object class="wxPanel" name="pickers">
                         <object class="wxFlexGridSizer">
@@ -1102,87 +1359,7 @@
                     </object>
                 </object>
 
-                <object class="notebookpage">
-                    <label>wxAnimationCtrl</label>
-                    <object class="wxPanel" name="animctrl">
-                        <object class="wxFlexGridSizer">
-                            <cols>2</cols>
-                            <rows>1</rows>
-                            <vgap>0</vgap>
-                            <hgap>0</hgap>
-                            <growablecols>0,1</growablecols>
-                            <growablerows>0</growablerows>
-
-                            <object class="sizeritem">
-                                <flag>wxALIGN_CENTRE|wxALL</flag>
-                                <border>5</border>
-                                <object class="wxButton" name="controls_animation_button_play">
-                                    <label>Play</label>
-                                </object>
-                            </object>
-
-                            <object class="sizeritem">
-                                <flag>wxALIGN_CENTRE|wxALL</flag>
-                                <border>5</border>
-                                <object class="wxAnimationCtrl" name="controls_animation_ctrl">
-                                    <animation>throbber.gif</animation>
-                                    <inactive-bitmap>stop.xpm</inactive-bitmap>
-                                </object>
-                            </object>
-
-                        </object>
-                    </object>
-                </object>
-
-                <object class="notebookpage">
-                    <label>wxCollapsiblePane</label>
-                    <object class="wxPanel" name="collpane">
-                        <object class="wxFlexGridSizer">
-                            <cols>1</cols>
-                            <rows>1</rows>
-                            <vgap>0</vgap>
-                            <hgap>0</hgap>
-                            <growablecols>0</growablecols>
-                            <growablerows>0</growablerows>
-
-                            <object class="sizeritem">
-                                <flag>wxGROW|wxALL</flag>
-                                <border>5</border>
-                                <option>1</option>
-                                <object class="wxCollapsiblePane" name="controls_collpane">
-                                    <label>Details:</label>
-                                    <collapsed>0</collapsed>
-                                    <object class="panewindow">
-
-                                        <object class="wxFlexGridSizer">
-                                            <cols>1</cols>
-                                            <rows>1</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="wxStaticText" name="controls_dialog_statictext">
-                                                    <label>
-Inside a wxCollapsiblePane you can put everything you want and
-lay them out using wxSizers, absolute positioning, everything you like!
-                                                    </label>
-                                                </object>
-                                            </object>
-                                        </object>
-
-                                    </object>
-                                </object>
-                            </object>
-
-                        </object>
-                    </object>
-                </object>
-
-                <object class="notebookpage">
+                <object class="choicebookpage">
                     <label>The Rest</label>
                     <object class="wxPanel" name="Rest">
                         <object class="wxFlexGridSizer">
@@ -1191,7 +1368,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                             <vgap>0</vgap>
                             <hgap>0</hgap>
                             <growablecols>0</growablecols>
-                            <growablerows>0,1,2,3,4,5,6</growablerows>
+                            <growablerows>0,1,2,3,4,5</growablerows>
                             <object class="sizeritem">
                                 <flag>wxALIGN_CENTRE|wxALL</flag>
                                 <border>5</border>
@@ -1216,8 +1393,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">
@@ -1227,13 +1404,6 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                     <label>wxSizer (Used throughout application)</label>
                                 </object>
                             </object>
-                            <object class="sizeritem">
-                                <flag>wxALIGN_CENTRE|wxALL</flag>
-                                <border>5</border>
-                                <object class="wxStaticText" name="controls_toolbar_statictext">
-                                    <label>wxToolbar (This application's main frame uses one)</label>
-                                </object>
-                            </object>
                             <object class="sizeritem">
                                 <flag>wxALIGN_CENTRE|wxALL</flag>
                                 <border>5</border>