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 c93c7d9cdc638fa98fe4ab2d2e19cdb473cdc61e..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>
-                            <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>
@@ -75,9 +74,8 @@
                                 </object>
                             </object>
                             <object class="sizeritem">
-                                <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                                <flag>wxEXPAND|wxALL</flag>
                                 <border>5</border>
-                                <size>300,60</size>
                                 <object class="wxToolBar">
                                     <style>wxTB_FLAT|wxTB_NODIVIDER</style>
                                     <margins>2,2</margins>
@@ -116,7 +114,7 @@
                                         <bitmap stock_id="wxART_GO_DOWN"/>
                                         <label>Down</label>
                                     </object>
-                                    <object class="separator"/>
+                                    <object class="space"/>
                                     <object class="wxComboBox">
                                         <content>
                                             <item>Just</item>
@@ -141,7 +139,7 @@
                                 </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>
@@ -165,6 +163,7 @@
                                             </object>
                                         </dropdown>
                                     </object>
+                                    <object class="separator"/>
                                     <object class="tool" name="home">
                                         <toggle>1</toggle>
                                         <bitmap stock_id="wxART_GO_HOME"/>
@@ -181,7 +180,7 @@
                                         <bitmap stock_id="wxART_GO_DOWN"/>
                                         <label>Down</label>
                                     </object>
-                                    <object class="separator"/>
+                                    <object class="space"/>
                                     <object class="wxComboBox">
                                         <content>
                                             <item>Just</item>
@@ -403,21 +402,21 @@
                                     <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>
@@ -471,15 +470,25 @@
                     </object>
                 </object>
                 <object class="notebookpage">
-                    <label>wxGenericDirCtrl</label>
+                    <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>
@@ -487,6 +496,13 @@
                                     <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>
@@ -584,8 +600,17 @@
                                 <border>5</border>
                                 <object class="wxListCtrl" name="controls_listctrl">
                                     <size>220,160</size>
-                                    <style>wxLC_REPORT</style>
-                                    <!-- this control is filled in from the code -->
+                                    <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">
@@ -593,7 +618,7 @@
                                 <border>5</border>
                                 <object class="wxListCtrl" name="controls_listctrl2">
                                     <size>220,160</size>
-                                    <style>wxLC_ICON</style>
+                                    <style>wxLC_ICON|wxBORDER_SIMPLE</style>
                                     <object class="listitem">
                                         <text>Information</text>
                                         <bitmap stock_id="wxART_INFORMATION"/>
@@ -609,7 +634,7 @@
                                 <border>5</border>
                                 <object class="wxListCtrl" name="controls_listctrl3">
                                     <size>220,160</size>
-                                    <style>wxLC_SMALL_ICON</style>
+                                    <style>wxLC_SMALL_ICON|wxBORDER_SIMPLE</style>
                                     <imagelist-small>
                                         <size>20,20</size>
                                         <bitmap stock_id="wxART_INFORMATION"/>