X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d56cebe7a497773d8753ea2ab874c4445bac18dc..6b7e0a8639098d55db2c7fb8f54a7558b95fe2c0:/wxPython/demo/data/resource_wdr.xrc?ds=sidebyside

diff --git a/wxPython/demo/data/resource_wdr.xrc b/wxPython/demo/data/resource_wdr.xrc
index 37a4b1b884..c42b0edb72 100644
--- a/wxPython/demo/data/resource_wdr.xrc
+++ b/wxPython/demo/data/resource_wdr.xrc
@@ -1,153 +1,146 @@
-<?xml version="1.0"?>
-<!-- XML resource generated by wxDesigner from file: resource.wdr -->
-<!-- Do not modify this file, all changes will be lost! -->
-
+<?xml version="1.0" ?>
 <resource>
-
-<object class="wxPanel" name="MyPanel">
-    <object class="wxFlexGridSizer">
-        <cols>2</cols>
-        <rows>0</rows>
-        <vgap>0</vgap>
-        <hgap>0</hgap>
-        <object class="sizeritem">
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
+  <object class="wxPanel" name="MyPanel">
+    <object class="wxGridBagSizer">
+      <vgap>0</vgap>
+      <hgap>0</hgap>
+      <object class="sizeritem">
+        <cellpos>0,0</cellpos>
+	<cellspan>4,1</cellspan>
+        <object class="wxFlexGridSizer">
+          <cols>2</cols>
+          <rows>0</rows>
+          <vgap>0</vgap>
+          <hgap>0</hgap>
+          <object class="sizeritem">
+            <flag>wxTOP|wxLEFT|wxRIGHT|wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
             <border>5</border>
             <object class="wxStaticText" name="ID_TEXT">
-                <label>Name:</label>
+              <label>Name:</label>
             </object>
-        </object>
-        <object class="sizeritem">
-            <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
+          </object>
+          <object class="sizeritem">
+            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxGROW|wxALIGN_CENTRE_VERTICAL</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_NameField">
-                <size>80,-1</size>
-                <value></value>
+              <size>80,-1</size>
+              <value></value>
             </object>
-        </object>
-        <object class="sizeritem">
+          </object>
+          <object class="sizeritem">
             <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxStaticText" name="ID_TEXT">
-                <label>Address:</label>
+              <label>Address:</label>
             </object>
-        </object>
-        <object class="sizeritem">
+          </object>
+          <object class="sizeritem">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_Addr1Field">
-                <size>80,-1</size>
-                <value></value>
+              <size>80,-1</size>
+              <value></value>
             </object>
-        </object>
-        <object class="spacer">
-            <flag>wxALIGN_CENTRE</flag>
-            <border>5</border>
-                <size>20,20</size>
-        </object>
-        <object class="sizeritem">
+          </object>
+          <object class="spacer">
+            <size>20,20</size>
+          </object>
+          <object class="sizeritem">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_TEXTCTRL">
-                <size>80,-1</size>
-                <value></value>
+              <size>80,-1</size>
+              <value></value>
             </object>
-        </object>
-        <object class="sizeritem">
+          </object>
+          <object class="sizeritem">
             <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxStaticText" name="ID_TEXT">
-                <label>City, State, Zip:</label>
+              <label>City, State, Zip:</label>
             </object>
-        </object>
-        <object class="sizeritem">
+          </object>
+          <object class="sizeritem">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
             <border>5</border>
             <object class="wxBoxSizer">
-                <orient>wxHORIZONTAL</orient>
-                <object class="sizeritem">
-                    <flag>wxALIGN_CENTRE|wxLEFT|wxTOP</flag>
-                    <border>5</border>
-                    <object class="wxTextCtrl" name="ID_CityField">
-                        <size>100,-1</size>
-                        <value></value>
-                    </object>
+              <orient>wxHORIZONTAL</orient>
+              <object class="sizeritem">
+                <flag>wxALIGN_CENTRE|wxLEFT|wxTOP</flag>
+                <border>5</border>
+                <object class="wxTextCtrl" name="ID_CityField">
+                  <size>100,-1</size>
+                  <value></value>
                 </object>
-                <object class="sizeritem">
-                    <flag>wxALIGN_CENTRE|wxLEFT|wxTOP</flag>
-                    <border>5</border>
-                    <object class="wxTextCtrl" name="ID_StateField">
-                        <size>30,-1</size>
-                        <value></value>
-                    </object>
+              </object>
+              <object class="sizeritem">
+                <flag>wxALIGN_CENTRE|wxLEFT|wxTOP</flag>
+                <border>5</border>
+                <object class="wxTextCtrl" name="ID_StateField">
+                  <size>30,-1</size>
+                  <value></value>
                 </object>
-                <object class="sizeritem">
-                    <flag>wxALIGN_CENTRE|wxLEFT|wxRIGHT|wxTOP</flag>
-                    <border>5</border>
-                    <object class="wxTextCtrl" name="ID_ZipField">
-                        <size>50,-1</size>
-                        <value></value>
-                    </object>
+              </object>
+              <object class="sizeritem">
+                <flag>wxALIGN_CENTRE|wxLEFT|wxRIGHT|wxTOP</flag>
+                <border>5</border>
+                <object class="wxTextCtrl" name="ID_ZipField">
+                  <size>50,-1</size>
+                  <value></value>
                 </object>
+              </object>
             </object>
-        </object>
-        <object class="sizeritem">
+          </object>
+          <object class="sizeritem">
             <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
             <border>5</border>
             <object class="wxStaticText" name="ID_TEXT">
-                <label>Phone:</label>
+              <label>Phone:</label>
             </object>
-        </object>
-        <object class="sizeritem">
+          </object>
+          <object class="sizeritem">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_PhoneField">
-                <size>80,-1</size>
-                <value></value>
+              <size>80,-1</size>
+              <value></value>
             </object>
-        </object>
-        <object class="sizeritem">
+          </object>
+          <object class="sizeritem">
             <flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL</flag>
             <border>5</border>
             <object class="wxStaticText" name="ID_TEXT">
-                <label>Email:</label>
+              <label>Email:</label>
             </object>
-        </object>
-        <object class="sizeritem">
+          </object>
+          <object class="sizeritem">
             <flag>wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP</flag>
             <border>5</border>
             <object class="wxTextCtrl" name="ID_EmailField">
-                <size>80,-1</size>
-                <value></value>
+              <size>80,-1</size>
+              <value></value>
             </object>
+          </object>
         </object>
-        <object class="spacer">
-            <flag>wxALIGN_CENTRE|wxALL</flag>
-            <border>5</border>
-                <size>20,20</size>
+      </object>
+      <object class="spacer">
+        <flag>wxALIGN_CENTRE|wxALL</flag>
+        <border>5</border>
+        <size>20,20</size>
+	<cellpos>0,1</cellpos>
+      </object>
+      <object class="sizeritem">
+        <cellpos>1,2</cellpos>
+	<object class="wxButton" name="wxID_OK">
+	  <label>Save</label>
         </object>
-        <object class="sizeritem">
-            <flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
-            <border>5</border>
-            <object class="wxBoxSizer">
-                <orient>wxHORIZONTAL</orient>
-                <object class="sizeritem">
-                    <flag>wxALIGN_CENTRE|wxALL</flag>
-                    <border>5</border>
-                    <object class="wxButton" name="wxID_OK">
-                        <label>Save</label>
-                    </object>
-                </object>
-                <object class="sizeritem">
-                    <flag>wxALIGN_CENTRE|wxALL</flag>
-                    <border>5</border>
-                    <object class="wxButton" name="wxID_CANCEL">
-                        <label>Cancel</label>
-                    </object>
-                </object>
-            </object>
+      </object>
+      <object class="sizeritem">
+        <cellpos>2,2</cellpos>
+	<object class="wxButton" name="wxID_CANCEL">
+	  <label>Cancel</label>
         </object>
+      </object>
     </object>
-</object>
-
-</resource>
+  </object>
+</resource>
\ No newline at end of file