updated XRC sample

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

diff --git a/contrib/samples/xml/Makefile.in b/contrib/samples/xml/Makefile.in
index 79cccd56223323114d58cd1afff0298ef0e49705..45ee21ad3172eacca8ad64577d414e59a160b037 100644 (file)
--- a/contrib/samples/xml/Makefile.in
+++ b/contrib/samples/xml/Makefile.in
@@ -17,7 +17,7 @@ APPEXTRALIBS=$(top_builddir)/lib/libwxxml.@WX_TARGET_LIBRARY_TYPE@
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 DATADIRS = rc
 APPEXTRADEFS=-I$(top_srcdir)/contrib/include
 
 DATADIRS = rc

-DATAFILES = rc/resource.xml rc/fileopen.gif rc/filesave.gif rc/fuzzy.gif \
+DATAFILES = rc/resource.xrc rc/fileopen.gif rc/filesave.gif rc/fuzzy.gif \

             rc/quotes.gif rc/scanning.gif rc/update.gif
 
 include $(top_builddir)/src/makeprog.env
             rc/quotes.gif rc/scanning.gif rc/update.gif
 
 include $(top_builddir)/src/makeprog.env

diff --git a/contrib/samples/xml/rc/resource.xrc b/contrib/samples/xml/rc/resource.xrc
index e031a548cdc159e63785df555e6ca3e96052f1e3..72492b8f1365f003b508af51acf3f44a4ac9fd8c 100644 (file)
--- a/contrib/samples/xml/rc/resource.xrc
+++ b/contrib/samples/xml/rc/resource.xrc
@@ -116,4 +116,39 @@
       <orient>wxVERTICAL</orient>
     </object>
   </object>
       <orient>wxVERTICAL</orient>
     </object>
   </object>

+  <object class="wxDialog" name="dlg2">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem" name="dfgdfg">
+        <object class="wxTextCtrl">
+          <size>200,200d</size>
+          <style>wxTE_MULTILINE|wxSUNKEN_BORDER</style>
+          <value>Hello, this is an ordinary multiline\n         textctrl....</value>
+        </object>
+        <option>1</option>
+        <flag>wxEXPAND|wxALL</flag>
+        <border>10</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_OK">
+              <label>Ok</label>
+              <default>1</default>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CANCEL">
+              <label>Cancel</label>
+            </object>
+            <border>10</border>
+            <flag>wxLEFT</flag>
+          </object>
+        </object>
+        <flag>wxLEFT|wxRIGHT|wxBOTTOM|wxALIGN_RIGHT</flag>
+        <border>10</border>
+      </object>
+    </object>
+    <title>Second testing dialog</title>
+  </object>

 </resource>
 </resource>