use XML namespace in XRC files

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

diff --git a/contrib/samples/xrc/rc/resource.xrc b/contrib/samples/xrc/rc/resource.xrc
index 72492b8f1365f003b508af51acf3f44a4ac9fd8c..9c91924d0c0d9444b3056b00d1739b815d110ddf 100644 (file)
--- a/contrib/samples/xrc/rc/resource.xrc
+++ b/contrib/samples/xrc/rc/resource.xrc
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<resource>
+<resource xmlns="http://www.wxwindows.org/wxxrc">

   <object class="wxMenuBar" name="mainmenu">
     <style>wxMB_DOCKABLE</style>
     <object class="wxMenu" name="menu_file">
   <object class="wxMenuBar" name="mainmenu">
     <style>wxMB_DOCKABLE</style>
     <object class="wxMenu" name="menu_file">

diff --git a/docs/tech/tn0014.txt b/docs/tech/tn0014.txt
index 69a3ad4b478f4e693395b7956ef4c9a60cf9d41e..d8c897fd19e378f5e55c13a2f790d10ced554c77 100644 (file)
--- a/docs/tech/tn0014.txt
+++ b/docs/tech/tn0014.txt
@@ -33,7 +33,7 @@ of an <object> or <object_ref> node. In the example bellow, <pos>, <label> and
 <style> are attributes, while neither <resource> nor either of <object>s is:
 
     <?xml version="1.0" encoding="utf-8">
 <style> are attributes, while neither <resource> nor either of <object>s is:
 
     <?xml version="1.0" encoding="utf-8">

-    <resource version="2.3.0.1">
+    <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">

         <object class="wxPanel">
             <style>wxSUNKEN_BORDER</style>
             <object class="wxStaticText">
         <object class="wxPanel">
             <style>wxSUNKEN_BORDER</style>
             <object class="wxStaticText">


@@ -46,7 +46,8 @@ of an <object> or <object_ref> node. In the example bellow, <pos>, <label> and
 2. Elementary description
 -------------------------
 
 2. Elementary description
 -------------------------
 

-XRC resource file is a well-formed XML 1.0 document. 
+XRC resource file is a well-formed XML 1.0 document. All elements of XRC file are
+from the http://www.wxwindows.org/wxxrc namespace. 

 
 The root node of XRC document must be <resource>. The <resource> node has 
 optional "version" property. Default version  (in absence of the version 
 
 The root node of XRC document must be <resource>. The <resource> node has 
 optional "version" property. Default version  (in absence of the version 


@@ -62,6 +63,10 @@ the second etc.
 Differences between versions are described within this document in paragraphs
 entitled "Version Note". 
 
 Differences between versions are described within this document in paragraphs
 entitled "Version Note". 
 

+The <resource> node contains namespace declaration, too:
+
+    <resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+

 The <resource> node is only allowed to have <object> and <object_ref>
 subnodes, all of which must have the "name" property.
 
 The <resource> node is only allowed to have <object> and <object_ref>
 subnodes, all of which must have the "name" property.
 

diff --git a/samples/xrc/rc/resource.xrc b/samples/xrc/rc/resource.xrc
index 72492b8f1365f003b508af51acf3f44a4ac9fd8c..9c91924d0c0d9444b3056b00d1739b815d110ddf 100644 (file)
--- a/samples/xrc/rc/resource.xrc
+++ b/samples/xrc/rc/resource.xrc
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<resource>
+<resource xmlns="http://www.wxwindows.org/wxxrc">

   <object class="wxMenuBar" name="mainmenu">
     <style>wxMB_DOCKABLE</style>
     <object class="wxMenu" name="menu_file">
   <object class="wxMenuBar" name="mainmenu">
     <style>wxMB_DOCKABLE</style>
     <object class="wxMenu" name="menu_file">