show the use of check and radio items in the toolbars

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index 7ac11defb6fe75b469ad4c6378674bf7407c378c..ba6a5288e780d1b7f2d872c57c395b3378851c0b 100644 (file)
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -81,47 +81,23 @@
                                 <object class="wxToolBar">
                                     <style>wxTB_FLAT|wxTB_NODIVIDER</style>
                                     <margins>2,2</margins>
                                 <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 class="tool" name="home">
+                                        <toggle>1</toggle>
+                                        <bitmap stock_id="wxART_GO_HOME"/>
+                                        <label>Home</label>

                                     </object>
                                     <object class="separator"/>
                                     </object>
                                     <object class="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 class="tool" name="up">
+                                        <radio>1</radio>
+                                        <bitmap stock_id="wxART_GO_UP"/>
+                                        <label>Up</label>

                                     </object>
                                     </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 class="tool" name="down">
+                                        <radio>1</radio>
+                                        <bitmap stock_id="wxART_GO_DOWN"/>
+                                        <label>Down</label>

                                     </object>
                                     </object>

+                                    <object class="separator"/>

                                     <object class="wxComboBox">
                                         <content>
                                             <item>Just</item>
                                     <object class="wxComboBox">
                                         <content>
                                             <item>Just</item>


@@ -152,47 +128,23 @@
                                     <style>wxTB_FLAT|wxTB_NODIVIDER</style>
                                     <bg>#bbbbff</bg>
                                     <margins>2,2</margins>
                                     <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 class="tool" name="home">
+                                        <toggle>1</toggle>
+                                        <bitmap stock_id="wxART_GO_HOME"/>
+                                        <label>Home</label>

                                     </object>
                                     <object class="separator"/>
                                     </object>
                                     <object class="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 class="tool" name="up">
+                                        <radio>1</radio>
+                                        <bitmap stock_id="wxART_GO_UP"/>
+                                        <label>Up</label>

                                     </object>
                                     </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 class="tool" name="down">
+                                        <radio>1</radio>
+                                        <bitmap stock_id="wxART_GO_DOWN"/>
+                                        <label>Down</label>

                                     </object>
                                     </object>

+                                    <object class="separator"/>

                                     <object class="wxComboBox">
                                         <content>
                                             <item>Just</item>
                                     <object class="wxComboBox">
                                         <content>
                                             <item>Just</item>