moving XRC to the core

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

diff --git a/docs/changes.txt b/docs/changes.txt
index b66f0365254d1daa4463aec6b092ca1c13b935bb..af2a77f1fc81e85c616b0a1598d4acae037f5f34 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -229,6 +229,7 @@ All (GUI):
 - recursive wxSizer::Show for subsizer and return value if element was found
 - added wxChoicebook control
 - smoother time estimation updates in wxProgressDialog (Christian Sturmlechner)
+- the XRC contrib library was moved to the core
 
 Unix:
 

diff --git a/docs/latex/wx/libs.bmp b/docs/latex/wx/libs.bmp
index f93a5bb6238bab4d59aae9cee9fa0ce9caa2bb91..8ae9028f417676162f47866c91a85c0579b3c2e1 100644 (file)
Binary files a/docs/latex/wx/libs.bmp and b/docs/latex/wx/libs.bmp differ

diff --git a/docs/latex/wx/libs.dia b/docs/latex/wx/libs.dia
index d6b928c3b21ef736cff8d4e69a136ea2965990e3..16a6248146c714527370a9b2e6477414877654f1 100644 (file)
--- a/docs/latex/wx/libs.dia
+++ b/docs/latex/wx/libs.dia
@@ -164,21 +164,21 @@
         <dia:point val="-2.55,6.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.55,3.05;0.85,7.3"/>
+        <dia:rectangle val="-2.6,3.05;0.85,6.55"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-2.55,6.5"/>
-        <dia:point val="-2.55,6.5"/>
-        <dia:point val="0.4,6.5"/>
+        <dia:point val="-1.2499,6.5"/>
+        <dia:point val="-1.2499,3.5"/>
         <dia:point val="0.4,3.5"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -202,13 +202,13 @@
         <dia:point val="-9.1999,8.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.2499,7.6;-6.4499,10"/>
+        <dia:rectangle val="-9.2499,7.6;-6.6499,10"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-9.1999,8.55"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="2.7000000000000002"/>
+        <dia:real val="2.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -225,7 +225,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxHTML#</dia:string>
+            <dia:string>#wxGL#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -247,13 +247,13 @@
     </dia:object>
     <dia:object type="UML - SmallPackage" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="-1.5499,10.75"/>
+        <dia:point val="-1.5499,11.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.5999,9.8;2.6001,12.2"/>
+        <dia:rectangle val="-1.5999,10.75;2.6001,13.15"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-1.5499,10.75"/>
+        <dia:point val="-1.5499,11.7"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.0999999999999996"/>
@@ -282,7 +282,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-1.2499,11.65"/>
+            <dia:point val="-1.2499,12.6"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -295,19 +295,17 @@
     </dia:object>
     <dia:object type="UML - Dependency" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-6.4999,9.25"/>
+        <dia:point val="-6.6999,9.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.4999,6.75;-4.8,10.05"/>
+        <dia:rectangle val="-6.7499,6.75;-4.8,10.05"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-6.4999,9.25"/>
-        <dia:point val="-6.4999,9.25"/>
+        <dia:point val="-6.6999,9.25"/>
         <dia:point val="-5.25,9.25"/>
         <dia:point val="-5.25,7.2"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
@@ -333,19 +331,17 @@
     </dia:object>
     <dia:object type="UML - Dependency" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="-1.5499,11.45"/>
+        <dia:point val="-1.5499,12.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.2499,6.75;-1.4999,12.275"/>
+        <dia:rectangle val="-3.2499,6.75;-1.4999,13.2"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-1.5499,11.45"/>
-        <dia:point val="-1.5499,11.475"/>
-        <dia:point val="-2.7999,11.475"/>
+        <dia:point val="-1.5499,12.4"/>
+        <dia:point val="-2.7999,12.4"/>
         <dia:point val="-2.7999,7.2"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
@@ -373,13 +369,13 @@
         <dia:point val="-8.9499,11.45"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-8.9999,10.5;-6.3999,12.9"/>
+        <dia:rectangle val="-8.9999,10.5;-6.1999,12.9"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-8.9499,11.45"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="2.5"/>
+        <dia:real val="2.7000000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -396,7 +392,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxGL#</dia:string>
+            <dia:string>#wxHTML#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -418,19 +414,17 @@
     </dia:object>
     <dia:object type="UML - Dependency" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="-6.4499,12.15"/>
+        <dia:point val="-6.2499,12.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.4999,6.75;-3.45,13"/>
+        <dia:rectangle val="-6.2999,6.75;-3.45,12.95"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="-6.4499,12.15"/>
-        <dia:point val="-6.4499,12.2"/>
-        <dia:point val="-3.9,12.2"/>
+        <dia:point val="-6.2499,12.15"/>
+        <dia:point val="-3.9,12.15"/>
         <dia:point val="-3.9,7.2"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
@@ -504,13 +498,13 @@
     </dia:object>
     <dia:object type="UML - SmallPackage" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.5001,4.3"/>
+        <dia:point val="12,4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.4501,3.35;7.0501,5.75"/>
+        <dia:rectangle val="11.95,3.05;14.55,5.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="4.5001,4.3"/>
+        <dia:point val="12,4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="2.5"/>
@@ -539,7 +533,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.8001,5.2"/>
+            <dia:point val="12.3,4.9"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -552,24 +546,24 @@
     </dia:object>
     <dia:object type="UML - Dependency" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="4.5001,5"/>
+        <dia:point val="12,4.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.65,3.05;4.5501,5.825"/>
+        <dia:rectangle val="2.65,2.35;12.05,4.75"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="4.5001,5"/>
-        <dia:point val="4.5001,5.025"/>
-        <dia:point val="3.1,5.025"/>
-        <dia:point val="3.1,3.5"/>
+        <dia:point val="12,4.7"/>
+        <dia:point val="10,4.7"/>
+        <dia:point val="10,2.8"/>
+        <dia:point val="3.1,2.8"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -585,7 +579,7 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O10" connection="3"/>
-        <dia:connection handle="1" to="O0" connection="7"/>
+        <dia:connection handle="1" to="O0" connection="4"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Dependency" version="0" id="O12">
@@ -593,16 +587,14 @@
         <dia:point val="2.9501,9.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.3,3.05;3.0001,10.025"/>
+        <dia:rectangle val="1.3,3.05;3.0001,9.95"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="2.9501,9.15"/>
-        <dia:point val="2.9501,9.225"/>
-        <dia:point val="1.75,9.225"/>
+        <dia:point val="1.75,9.15"/>
         <dia:point val="1.75,3.5"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
@@ -679,18 +671,18 @@
         <dia:point val="7.6001,6.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.65,3.05;7.6501,7.575"/>
+        <dia:rectangle val="2.65,3.05;7.6501,6.7"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="7.6001,6.65"/>
-        <dia:point val="7.6001,6.775"/>
-        <dia:point val="3.1,6.775"/>
+        <dia:point val="5.35005,6.65"/>
+        <dia:point val="5.35005,3.5"/>
         <dia:point val="3.1,3.5"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
         <dia:boolean val="true"/>
@@ -765,16 +757,14 @@
         <dia:point val="3.8001,14.175"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.0501,11.7;3.8001,14.975"/>
+        <dia:rectangle val="0.0501,12.65;3.8501,14.975"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="3.8001,14.175"/>
         <dia:point val="3.8001,14.175"/>
         <dia:point val="0.5001,14.175"/>
-        <dia:point val="0.5001,12.15"/>
+        <dia:point val="0.5001,13.1"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
@@ -836,5 +826,197 @@
         <dia:connection handle="1" to="O13" connection="6"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="UML - SmallPackage" version="0" id="O18">
+      <dia:attribute name="obj_pos">
+        <dia:point val="1,16"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="0.95,15.05;3.55,17.45"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="1,16"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="2.5"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="1.3999999999999999"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_colour">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#wxXRC#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="monospace" style="0" name="Courier"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="1.3,16.9"/>
+          </dia:attribute>
+          <dia:attribute name="color">
+            <dia:color val="#000000"/>
+          </dia:attribute>
+          <dia:attribute name="alignment">
+            <dia:enum val="0"/>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+    </dia:object>
+    <dia:object type="UML - Dependency" version="0" id="O19">
+      <dia:attribute name="obj_pos">
+        <dia:point val="3.5,16.7"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="3.45,4.95;13.7,17.5"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="3.5,16.7"/>
+        <dia:point val="13.25,16.7"/>
+        <dia:point val="13.25,5.4"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="draw_arrow">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O18" connection="4"/>
+        <dia:connection handle="1" to="O10" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Dependency" version="0" id="O20">
+      <dia:attribute name="obj_pos">
+        <dia:point val="1,16.7"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-1.9999,12.65;1.05,17.5"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="1,16.7"/>
+        <dia:point val="-1.5499,16.7"/>
+        <dia:point val="-1.5499,13.1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="draw_arrow">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O18" connection="3"/>
+        <dia:connection handle="1" to="O4" connection="5"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Dependency" version="0" id="O21">
+      <dia:attribute name="obj_pos">
+        <dia:point val="1,17.4"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-8.0499,12.4;1.05,18.2"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="1,17.4"/>
+        <dia:point val="-7.5999,17.4"/>
+        <dia:point val="-7.5999,12.85"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="draw_arrow">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O18" connection="5"/>
+        <dia:connection handle="1" to="O7" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Dependency" version="0" id="O22">
+      <dia:attribute name="obj_pos">
+        <dia:point val="1,17.4"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-4.35,6.75;1.05,18.2"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="1,17.4"/>
+        <dia:point val="-3.9,17.4"/>
+        <dia:point val="-3.9,7.2"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="draw_arrow">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O18" connection="5"/>
+        <dia:connection handle="1" to="O1" connection="6"/>
+      </dia:connections>
+    </dia:object>
   </dia:layer>
 </dia:diagram>

diff --git a/docs/latex/wx/libs.gif b/docs/latex/wx/libs.gif
index 51bc8e486da5430e8e23012ce3c87e42272fb856..8eb7d02bf890f4ee180d65810c6ab617b5ddb0b4 100644 (file)
Binary files a/docs/latex/wx/libs.gif and b/docs/latex/wx/libs.gif differ

diff --git a/docs/latex/wx/libs.tex b/docs/latex/wx/libs.tex
index 437663ac9f469c1c703ea32cdccbee0a41bcaeb5..3e6ba6d0482a8b1bbf8c8ccccb410bcc10a0d325 100644 (file)
--- a/docs/latex/wx/libs.tex
+++ b/docs/latex/wx/libs.tex
@@ -101,3 +101,9 @@ contained in this library, as well as
  \helpref{wxGrid}{wxgrid} and \helpref{wxDbTable}{wxdbtable}. 
 Requires wxODBC and wxAdvanced.
 
+{\large {\bf wxXRC}}
+
+This library contains \helpref{wxXmlResource}{wxxmlresource} class that
+provides access to XML resource files in XRC format.
+Requires wxXML, wxCore, wxAdvanced and wxHTML.
+