Correct the fix that broke wxRegion::ConvertToBitmap().

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

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index ffc6413fcc89df86a457d548c9071cbd949ed705..e5faea49f62f79b69c2d593edca1ef2462340414 100644 (file)
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -65,8 +65,7 @@
                             <rows>0</rows>
                             <vgap>0</vgap>
                             <hgap>0</hgap>
                             <rows>0</rows>
                             <vgap>0</vgap>
                             <hgap>0</hgap>

-                            <growablecols>0,1</growablecols>
-                            <growablerows>0,1</growablerows>
+                            <growablecols>1</growablecols>

                             <object class="sizeritem">
                                 <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
                                 <border>5</border>
                             <object class="sizeritem">
                                 <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
                                 <border>5</border>


@@ -75,53 +74,47 @@
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 </object>
                             </object>
                             <object class="sizeritem">

-                                <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                                <flag>wxEXPAND|wxALL</flag>

                                 <border>5</border>
                                 <border>5</border>

-                                <size>300,60</size>

                                 <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 class="tool" name="New">
+                                        <bitmap stock_id="wxART_NEW"/>
+                                        <label>New</label>

                                     </object>
                                     </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 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>

-                                    <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 class="separator"/>
+                                    <object class="tool" name="home">
+                                        <toggle>1</toggle>
+                                        <bitmap stock_id="wxART_GO_HOME"/>
+                                        <label>Home</label>

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

                                     </object>
                                     </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="space"/>

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


@@ -146,53 +139,48 @@
                                 </object>
                             </object>
                             <object class="sizeritem">
                                 </object>
                             </object>
                             <object class="sizeritem">

-                                <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                                <flag>wxEXPAND|wxALL</flag>

                                 <border>5</border>
                                 <object class="wxToolBar">
                                     <style>wxTB_FLAT|wxTB_NODIVIDER</style>
                                     <bg>#bbbbff</bg>
                                     <margins>2,2</margins>
                                 <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 class="tool" name="New">
+                                        <bitmap stock_id="wxART_NEW"/>
+                                        <label>New</label>

                                     </object>
                                     </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 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>

-                                    <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 class="separator"/>
+                                    <object class="tool" name="home">
+                                        <toggle>1</toggle>
+                                        <bitmap stock_id="wxART_GO_HOME"/>
+                                        <label>Home</label>

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

                                     </object>
                                     </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="space"/>

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


@@ -414,21 +402,21 @@
                                     <style>wxCB_READONLY</style>
                                     <selection>2</selection>
                                     <object class="ownerdrawnitem">
                                     <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">
                                     <object class="ownerdrawnitem">

-                                                                               <text>read-only</text>
-                                                                               <bitmap>derivdlg.xpm</bitmap>
-                                                                        </object>
+                                        <text>read-only</text>
+                                        <bitmap>derivdlg.xpm</bitmap>
+                                     </object>

                                     <object class="ownerdrawnitem">
                                     <object class="ownerdrawnitem">

-                                                                               <text>wxBitmapComboBox</text>
-                                                                               <bitmap>uncenter.xpm</bitmap>
-                                                                        </object>
+                                        <text>wxBitmapComboBox</text>
+                                        <bitmap>uncenter.xpm</bitmap>
+                                     </object>

                                     <object class="ownerdrawnitem">
                                     <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>


@@ -482,15 +470,25 @@
                     </object>
                 </object>
                 <object class="notebookpage">
                     </object>
                 </object>
                 <object class="notebookpage">

-                    <label>wxGenericDirCtrl</label>
+                    <label>wxFile/DirCtrl</label>

                     <object class="wxPanel" name="genericdirctrl">
                         <object class="wxFlexGridSizer">
                     <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>
                             <object class="sizeritem">
                                 <flag>wxALIGN_CENTRE|wxALL</flag>
                                 <border>5</border>


@@ -498,6 +496,13 @@
                                     <size>200,200</size>
                                 </object>
                             </object>
                                     <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>
                     </object>
                 </object>


@@ -589,19 +594,60 @@
                 <object class="notebookpage">
                     <label>wxListCtrl</label>
                     <object class="wxPanel" name="listctrl">
                 <object class="notebookpage">
                     <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>
                             <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>
+                                    <object class="listcol">
+                                        <text>Name</text>
+                                        <width>150</width>
+                                    </object>
+                                    <object class="listcol">
+                                        <text>Weight</text>
+                                        <align>wxLIST_FORMAT_RIGHT</align>
+                                        <width>50</width>
+                                    </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>


@@ -704,10 +750,12 @@
                                     <selection>0</selection>
                                     <content>
                                         <item tooltip="Powerful radio station" helptext="This station is for amateurs of hard rock and heavy metal">Power 108</item>
                                     <selection>0</selection>
                                     <content>
                                         <item tooltip="Powerful radio station" helptext="This station is for amateurs of hard rock and heavy metal">Power 108</item>

+                                        <item tooltip="Disabled radio station" enabled="0">Power 0</item>

                                         <item tooltip="">WMMS 100.7</item>
                                         <item tooltip="E=mc^2">Energy 98.3</item>
                                         <item helptext="Favourite chukcha's radio">CHUM FM</item>
                                         <item>92FM</item>
                                         <item tooltip="">WMMS 100.7</item>
                                         <item tooltip="E=mc^2">Energy 98.3</item>
                                         <item helptext="Favourite chukcha's radio">CHUM FM</item>
                                         <item>92FM</item>

+                                        <item hidden="1">Very quite station</item>

                                     </content>
                                 </object>
                             </object>
                                     </content>
                                 </object>
                             </object>


@@ -976,6 +1024,21 @@
                                     <value>"So many pretty widgets" said Pooh, said he. "So many pretty widgets", said Pooh.</value>
                                 </object>
                             </object>
                                     <value>"So many pretty widgets" said Pooh, said he. "So many pretty widgets", said Pooh.</value>
                                 </object>
                             </object>

+                            <object class="sizeritem">
+                                <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxStaticText" name="controls_textctrl4_statictext">
+                                    <label>Search for:</label>
+                                </object>
+                            </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxSearchCtrl" name="controls_multiline_searchctrl">
+                                    <size>180,-1</size>
+                                    <value>true love</value>
+                                </object>
+                            </object>

                         </object>
                     </object>
                 </object>
                         </object>
                     </object>
                 </object>