From 62795f413a7222863b4aee76c08764071f94bd87 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Thu, 3 Oct 2013 11:08:54 +0000
Subject: [PATCH] Misc validity fixes to samples/xrc/rc/*.xrc.

Fix invalid XRC markup.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/xrc/rc/basicdlg.xrc | 6 ------
 samples/xrc/rc/controls.xrc | 6 ++++--
 samples/xrc/rc/objref.xrc   | 3 ---
 samples/xrc/rc/platform.xrc | 3 +--
 samples/xrc/rc/resource.xrc | 3 +--
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/samples/xrc/rc/basicdlg.xrc b/samples/xrc/rc/basicdlg.xrc
index ae632f6e10..55857ca13f 100644
--- a/samples/xrc/rc/basicdlg.xrc
+++ b/samples/xrc/rc/basicdlg.xrc
@@ -7,12 +7,6 @@
     <centered>1</centered>
     <object class="wxBoxSizer">
         <orient>wxVERTICAL</orient>
-        <cols>1</cols>
-        <rows>0</rows>
-        <vgap>0</vgap>
-        <hgap>0</hgap>
-        <growablecols>0</growablecols>
-        <growablerows>0</growablerows>
         <object class="sizeritem">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
             <border>5</border>
diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index 627ea092ec..1442be70af 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -416,7 +416,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                 <object class="wxGauge" name="controls_horizontal_gauge">
                                     <style>wxGA_SMOOTH</style>
                                     <size>100,-1</size>
-                                    <max>100</max>
+                                    <range>100</range>
                                     <value>50</value>
                                 </object>
                             </object>
@@ -433,7 +433,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                 <object class="wxGauge" name="controls_vertical_gauge">
                                     <style>wxGA_VERTICAL</style>
                                     <size>40,60</size>
-                                    <max>100</max>
+                                    <range>100</range>
                                     <value>40</value>
                                 </object>
                             </object>
@@ -472,6 +472,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                 <border>5</border>
                                 <object class="wxFileCtrl">
                                     <wildcard>Text files (*.txt)</wildcard>
+                                    <message>Choose file</message>
                                 </object>
                             </object>
                         </object>
@@ -1321,6 +1322,7 @@ lay them out using wxSizers, absolute positioning, everything you like!
                                         <depth>1</depth>
                                         <image>1</image>
                                         <expanded>1</expanded>
+                                        <object class="wxPanel"/>
                                     </object>
                                     <object class="treebookpage">
                                         <label>Page 3</label>
diff --git a/samples/xrc/rc/objref.xrc b/samples/xrc/rc/objref.xrc
index 7028045d69..9ce846bfcc 100644
--- a/samples/xrc/rc/objref.xrc
+++ b/samples/xrc/rc/objref.xrc
@@ -25,7 +25,6 @@
                 <vgap>0</vgap>
                 <hgap>10</hgap>
                 <growablecols>0</growablecols>
-                <growablerows>0</growablerows>
                 <growablerows>1</growablerows>
               </object>
             </object>
@@ -154,7 +153,6 @@
                 <vgap>0</vgap>
                 <hgap>10</hgap>
                 <growablecols>0</growablecols>
-                <growablerows>0</growablerows>
                 <growablerows>2</growablerows>
               </object>
             </object>
@@ -332,7 +330,6 @@
                 <vgap>0</vgap>
                 <hgap>10</hgap>
                 <growablecols>0</growablecols>
-                <growablerows>0</growablerows>
                 <growablerows>2</growablerows>
               </object>
             </object>
diff --git a/samples/xrc/rc/platform.xrc b/samples/xrc/rc/platform.xrc
index 43313cb853..d2056527d3 100644
--- a/samples/xrc/rc/platform.xrc
+++ b/samples/xrc/rc/platform.xrc
@@ -25,7 +25,6 @@
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxALL</flag>
             <border>5</border>
             <object class="wxNotebook" name="platform_notebook">
-                <usenotebooksizer>1</usenotebooksizer>
                 <size>200,160</size>
                 <object class="notebookpage">
                     <label>Shared options</label>
@@ -125,7 +124,7 @@
                 <label>Get latest update at www.mycompany.com/download/unix</label>
             </object>
         </object>    
-        <object platform="os2kurva" class="sizeritem">
+        <object platform="os2" class="sizeritem">
             <flag>wxALIGN_CENTRE|wxALL</flag>
             <border>5</border>
             <object class="wxStaticText" name="download_os2_statictext">
diff --git a/samples/xrc/rc/resource.xrc b/samples/xrc/rc/resource.xrc
index bb510a3555..868bd4986f 100644
--- a/samples/xrc/rc/resource.xrc
+++ b/samples/xrc/rc/resource.xrc
@@ -37,7 +37,7 @@
       <bitmap>update.gif</bitmap>
       <tooltip>Update catalog - synchronize it with sources</tooltip>
     </object>
-    <separator/>
+    <object class="separator"/>
     <object class="tool" name="menu_quotes">
       <bitmap>quotes.gif</bitmap>
       <toggle>1</toggle>
@@ -109,7 +109,6 @@
             </object>
             <label>Page 2</label>
           </object>
-          <usenotebooksizer>1</usenotebooksizer>
         </object>
         <flag>wxEXPAND</flag>
       </object>
-- 
2.45.2