X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/671bf007ddc1823506bdec7013002bd56e744256..ab9717339232a7a728dea666c59b73fd6ac78dd3:/docs/latex/wx/libs.dia

diff --git a/docs/latex/wx/libs.dia b/docs/latex/wx/libs.dia
index 2faa38f124..f351511085 100644
--- a/docs/latex/wx/libs.dia
+++ b/docs/latex/wx/libs.dia
@@ -65,16 +65,16 @@
   <dia:layer name="Background" visible="true">
     <dia:object type="UML - SmallPackage" version="0" id="O0">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.4,2.1"/>
+        <dia:point val="-8.8999,2.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.35,1.15;3.15,3.55"/>
+        <dia:rectangle val="-8.9499,1.6;-6.3499,4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="0.4,2.1"/>
+        <dia:point val="-8.8999,2.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"/>
@@ -83,7 +83,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -91,7 +91,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxBase#</dia:string>
+            <dia:string>#wxGL#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -100,7 +100,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="0.7,2.95"/>
+            <dia:point val="-8.5999,3.3925"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -113,16 +113,16 @@
     </dia:object>
     <dia:object type="UML - SmallPackage" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.25,5.8"/>
+        <dia:point val="-8.8999,10"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.3,4.85;-2.5,7.25"/>
+        <dia:rectangle val="-8.9499,9.05;-4.7499,11.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-5.25,5.8"/>
+        <dia:point val="-8.8999,10"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="2.7000000000000002"/>
+        <dia:real val="4.0999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -131,7 +131,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -139,7 +139,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxCore#</dia:string>
+            <dia:string>#wxAdvanced#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -148,7 +148,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-4.95,6.65"/>
+            <dia:point val="-8.5999,10.8425"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -159,56 +159,18 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O2">
+    <dia:object type="UML - SmallPackage" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="-2.55,6.5"/>
+        <dia:point val="-13.9499,5.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <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="-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="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
-      </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="O1" connection="4"/>
-        <dia:connection handle="1" to="O0" connection="5"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - SmallPackage" version="0" id="O3">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-9.1999,8.55"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.2499,7.6;-6.6499,10"/>
+        <dia:rectangle val="-13.9999,5;-11.1999,7.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-9.1999,8.55"/>
+        <dia:point val="-13.9499,5.95"/>
       </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"/>
@@ -217,7 +179,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -225,7 +187,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"/>
@@ -234,7 +196,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-8.8999,9.4"/>
+            <dia:point val="-13.6499,6.7925"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -245,18 +207,18 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - SmallPackage" version="0" id="O4">
+    <dia:object type="UML - SmallPackage" version="0" id="O3">
       <dia:attribute name="obj_pos">
-        <dia:point val="-1.5499,11.7"/>
+        <dia:point val="1.1501,2.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.5999,10.75;2.6001,13.15"/>
+        <dia:rectangle val="1.1001,1.7;3.7001,4.1"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-1.5499,11.7"/>
+        <dia:point val="1.1501,2.65"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="4.0999999999999996"/>
+        <dia:real val="2.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -265,7 +227,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00cfff"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -273,7 +235,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxAdvanced#</dia:string>
+            <dia:string>#wxNet#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -282,7 +244,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-1.2499,12.55"/>
+            <dia:point val="1.4501,3.4925"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -293,89 +255,18 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O5">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-6.6999,9.25"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.7499,6.75;-4.8,10.05"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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="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="O3" connection="4"/>
-        <dia:connection handle="1" to="O1" connection="5"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O6">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-1.5499,12.4"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.2499,6.75;-1.4999,13.2"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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="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="O4" connection="3"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - SmallPackage" version="0" id="O7">
+    <dia:object type="UML - SmallPackage" version="0" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="-8.9499,11.45"/>
+        <dia:point val="11.1,2.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-8.9999,10.5;-6.1999,12.9"/>
+        <dia:rectangle val="11.05,1.7;13.65,4.1"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-8.9499,11.45"/>
+        <dia:point val="11.1,2.65"/>
       </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"/>
@@ -384,7 +275,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00cfff"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -392,7 +283,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxHTML#</dia:string>
+            <dia:string>#wxXML#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -401,7 +292,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-8.6499,12.3"/>
+            <dia:point val="11.4,3.4925"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -412,54 +303,18 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O8">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-6.2499,12.15"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-6.2999,6.75;-3.45,12.95"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <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="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="O7" connection="4"/>
-        <dia:connection handle="1" to="O1" connection="6"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - SmallPackage" version="0" id="O9">
+    <dia:object type="UML - SmallPackage" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.9501,8.45"/>
+        <dia:point val="6.0501,2.55"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.9001,7.5;5.5001,9.9"/>
+        <dia:rectangle val="6.0001,1.6;8.8001,4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.9501,8.45"/>
+        <dia:point val="6.0501,2.55"/>
       </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"/>
@@ -468,7 +323,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00cfff"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -476,7 +331,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxNet#</dia:string>
+            <dia:string>#wxODBC#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -485,7 +340,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="3.2501,9.3"/>
+            <dia:point val="6.3501,3.3925"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -496,18 +351,18 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - SmallPackage" version="0" id="O10">
+    <dia:object type="UML - SmallPackage" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="12,4"/>
+        <dia:point val="1.1501,9.975"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="11.95,3.05;14.55,5.45"/>
+        <dia:rectangle val="1.1001,9.025;4.6001,11.425"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="12,4"/>
+        <dia:point val="1.1501,9.975"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="2.5"/>
+        <dia:real val="3.3999999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -516,7 +371,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -524,7 +379,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxXML#</dia:string>
+            <dia:string>#wxDbGrid#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -533,7 +388,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="12.3,4.85"/>
+            <dia:point val="1.4501,10.8175"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -544,18 +399,18 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O11">
+    <dia:object type="UML - Dependency" version="1" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="12,4.7"/>
+        <dia:point val="1.1501,10.675"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.65,2.35;12.05,4.75"/>
+        <dia:rectangle val="-5.2499,9.8875;1.2001,11.4875"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <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:point val="1.1501,10.675"/>
+        <dia:point val="-1.8249,10.675"/>
+        <dia:point val="-1.8249,10.7"/>
+        <dia:point val="-4.7999,10.7"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -563,7 +418,10 @@
         <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -578,28 +436,33 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O10" connection="3"/>
-        <dia:connection handle="1" to="O0" connection="4"/>
+        <dia:connection handle="0" to="O6" connection="3"/>
+        <dia:connection handle="1" to="O1" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O12">
+    <dia:object type="UML - Dependency" version="1" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.9501,9.15"/>
+        <dia:point val="4.5501,9.975"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.3,3.05;3.0001,9.95"/>
+        <dia:rectangle val="4.5001,3.45;7.0501,10.025"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="2.9501,9.15"/>
-        <dia:point val="1.75,9.15"/>
-        <dia:point val="1.75,3.5"/>
+        <dia:point val="4.5501,9.975"/>
+        <dia:point val="4.5501,8.18"/>
+        <dia:point val="6.6001,8.18"/>
+        <dia:point val="6.6001,3.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
+        <dia:enum val="1"/>
         <dia:enum val="0"/>
         <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -614,22 +477,21 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O9" connection="3"/>
-        <dia:connection handle="1" to="O0" connection="6"/>
+        <dia:connection handle="0" to="O6" connection="2"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - SmallPackage" version="0" id="O13">
+    <dia:object type="UML - SmallPackage" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.6001,5.95"/>
+        <dia:point val="6.15,13.95"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.5501,5;10.3501,7.4"/>
+        <dia:rectangle val="6.1,13;8.7,15.4"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="7.6001,5.95"/>
+        <dia:point val="6.15,13.95"/>
       </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"/>
@@ -638,7 +500,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -646,7 +508,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxODBC#</dia:string>
+            <dia:string>#wxXRC#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -655,7 +517,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="7.9001,6.8"/>
+            <dia:point val="6.45,14.7925"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -666,27 +528,106 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O14">
+    <dia:object type="UML - Dependency" version="1" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.6001,6.65"/>
+        <dia:point val="8.65,14.65"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.65,3.05;7.6501,6.7"/>
+        <dia:rectangle val="8.6,3.6;12.8,15.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="7.6001,6.65"/>
-        <dia:point val="5.35005,6.65"/>
-        <dia:point val="5.35005,3.5"/>
-        <dia:point val="3.1,3.5"/>
+        <dia:point val="8.65,14.65"/>
+        <dia:point val="12.35,14.65"/>
+        <dia:point val="12.35,4.05"/>
       </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="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </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="O9" connection="4"/>
+        <dia:connection handle="1" to="O4" connection="6"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Dependency" version="1" id="O11">
+      <dia:attribute name="obj_pos">
+        <dia:point val="6.15,14.65"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-9.3499,10.95;6.2,15.45"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="6.15,14.65"/>
+        <dia:point val="-8.8999,14.65"/>
+        <dia:point val="-8.8999,11.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="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </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="O9" connection="3"/>
+        <dia:connection handle="1" to="O1" connection="5"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Dependency" version="1" id="O12">
+      <dia:attribute name="obj_pos">
+        <dia:point val="6.15,15.35"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-13.0499,6.9;6.2,16.15"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="6.15,15.35"/>
+        <dia:point val="-12.5999,15.35"/>
+        <dia:point val="-12.5999,7.35"/>
+      </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="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
       </dia:attribute>
@@ -700,22 +641,22 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O13" connection="3"/>
-        <dia:connection handle="1" to="O0" connection="7"/>
+        <dia:connection handle="0" to="O9" connection="5"/>
+        <dia:connection handle="1" to="O2" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - SmallPackage" version="0" id="O15">
+    <dia:object type="UML - SmallPackage" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.8001,13.475"/>
+        <dia:point val="6.1951,9.995"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.7501,12.525;7.2501,14.925"/>
+        <dia:rectangle val="6.1451,9.045;8.7451,11.445"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="3.8001,13.475"/>
+        <dia:point val="6.1951,9.995"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="3.3999999999999999"/>
+        <dia:real val="2.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -724,7 +665,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -732,7 +673,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxDbGrid#</dia:string>
+            <dia:string>#wxQA#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -741,7 +682,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="4.1001,14.325"/>
+            <dia:point val="6.4951,10.8375"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -752,24 +693,27 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O16">
+    <dia:object type="UML - Dependency" version="1" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.8001,14.175"/>
+        <dia:point val="8.6951,10.695"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.0501,12.65;3.8501,14.975"/>
+        <dia:rectangle val="8.6451,3.6;14.05,11.495"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="3.8001,14.175"/>
-        <dia:point val="0.5001,14.175"/>
-        <dia:point val="0.5001,13.1"/>
+        <dia:point val="8.6951,10.695"/>
+        <dia:point val="13.6,10.695"/>
+        <dia:point val="13.6,4.05"/>
       </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:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -784,57 +728,67 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O15" connection="3"/>
-        <dia:connection handle="1" to="O4" connection="6"/>
+        <dia:connection handle="0" to="O13" connection="4"/>
+        <dia:connection handle="1" to="O4" connection="7"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O17">
+    <dia:object type="UML - SmallPackage" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.2001,14.175"/>
+        <dia:point val="-3.8899,2.565"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.1501,6.9;9.4001,15.025"/>
+        <dia:rectangle val="-3.9399,1.615;-0.7899,4.015"/>
       </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="7.2001,14.175"/>
-        <dia:point val="7.2001,14.225"/>
-        <dia:point val="8.9501,14.225"/>
-        <dia:point val="8.9501,7.35"/>
+      <dia:attribute name="elem_corner">
+        <dia:point val="-3.8899,2.565"/>
       </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
+      <dia:attribute name="elem_width">
+        <dia:real val="3.0500000000000003"/>
       </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+      <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="name">
-        <dia:string>##</dia:string>
+      <dia:attribute name="fill_colour">
+        <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
       </dia:attribute>
-      <dia:attribute name="draw_arrow">
-        <dia:boolean val="true"/>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>#wxMedia#</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="-3.5899,3.4075"/>
+          </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:connections>
-        <dia:connection handle="0" to="O15" connection="4"/>
-        <dia:connection handle="1" to="O13" connection="6"/>
-      </dia:connections>
     </dia:object>
-    <dia:object type="UML - SmallPackage" version="0" id="O18">
+    <dia:object type="UML - SmallPackage" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="1,16"/>
+        <dia:point val="-3.8349,16.93"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.95,15.05;3.55,17.45"/>
+        <dia:rectangle val="-3.8849,15.98;-1.2849,18.38"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="1,16"/>
+        <dia:point val="-3.8349,16.93"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="2.5"/>
@@ -846,7 +800,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -854,7 +808,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxXRC#</dia:string>
+            <dia:string>#wxAUI#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -863,7 +817,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="1.3,16.85"/>
+            <dia:point val="-3.5349,17.7725"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -874,60 +828,67 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O19">
+    <dia:object type="Standard - Text" version="1" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.5,16.7"/>
+        <dia:point val="-2.5849,17.63"/>
       </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:rectangle val="-2.5849,17.23;-2.5849,18.43"/>
       </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="stereotype">
-        <dia:string>##</dia:string>
+      <dia:attribute name="text">
+        <dia:composite type="text">
+          <dia:attribute name="string">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="font">
+            <dia:font family="sans" style="0" name="Helvetica"/>
+          </dia:attribute>
+          <dia:attribute name="height">
+            <dia:real val="0.80000000000000004"/>
+          </dia:attribute>
+          <dia:attribute name="pos">
+            <dia:point val="-2.5849,17.63"/>
+          </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:attribute name="draw_arrow">
-        <dia:boolean val="true"/>
+      <dia:attribute name="valign">
+        <dia:enum val="3"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O18" connection="4"/>
-        <dia:connection handle="1" to="O10" connection="6"/>
+        <dia:connection handle="0" to="O16" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O20">
+    <dia:object type="UML - Dependency" version="1" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="1,16.7"/>
+        <dia:point val="-3.8349,17.63"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.9999,12.65;1.05,17.5"/>
+        <dia:rectangle val="-7.2999,10.95;-3.7849,18.04"/>
       </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:point val="-3.8349,17.63"/>
+        <dia:point val="-6.7774,17.63"/>
+        <dia:point val="-6.7774,17.24"/>
+        <dia:point val="-6.8499,17.24"/>
+        <dia:point val="-6.8499,11.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
-        <dia:boolean val="true"/>
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -942,21 +903,21 @@
         <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:connection handle="0" to="O16" connection="3"/>
+        <dia:connection handle="1" to="O1" connection="6"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O21">
+    <dia:object type="UML - Dependency" version="1" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="1,17.4"/>
+        <dia:point val="-3.8349,18.33"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-8.0499,12.4;1.05,18.2"/>
+        <dia:rectangle val="-14.3999,6.9;-3.7849,19.13"/>
       </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:point val="-3.8349,18.33"/>
+        <dia:point val="-13.9499,18.33"/>
+        <dia:point val="-13.9499,7.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -965,6 +926,9 @@
       <dia:attribute name="orth_autoroute">
         <dia:boolean val="true"/>
       </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
       </dia:attribute>
@@ -978,28 +942,31 @@
         <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:connection handle="0" to="O16" connection="5"/>
+        <dia:connection handle="1" to="O2" connection="5"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O22">
+    <dia:object type="UML - Dependency" version="1" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="1,17.4"/>
+        <dia:point val="-1.3349,17.63"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.35,6.75;1.05,18.2"/>
+        <dia:rectangle val="-1.3849,3.6;11.55,18.43"/>
       </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:point val="-1.3349,17.63"/>
+        <dia:point val="11.1,17.63"/>
+        <dia:point val="11.1,4.05"/>
       </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:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
@@ -1014,22 +981,22 @@
         <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:connection handle="0" to="O16" connection="4"/>
+        <dia:connection handle="1" to="O4" connection="5"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - SmallPackage" version="0" id="O23">
+    <dia:object type="UML - SmallPackage" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.5451,18.995"/>
+        <dia:point val="-8.8899,6.005"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.4951,18.045;8.0951,20.445"/>
+        <dia:rectangle val="-8.9399,5.055;-4.7399,7.455"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="5.5451,18.995"/>
+        <dia:point val="-8.8899,6.005"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="2.5"/>
+        <dia:real val="4.0999999999999996"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -1038,7 +1005,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -1046,7 +1013,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxQA#</dia:string>
+            <dia:string>#wxRichtext#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -1055,7 +1022,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="5.8451,19.845"/>
+            <dia:point val="-8.5899,6.8475"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1066,25 +1033,71 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O24">
+    <dia:object type="UML - Dependency" version="1" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="8.0451,19.695"/>
+        <dia:point val="-4.7899,7.405"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="7.9951,4.95;14.95,20.495"/>
+        <dia:rectangle val="-5.2499,7.355;-3.5274,10.45"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="8.0451,19.695"/>
-        <dia:point val="14.5,19.695"/>
-        <dia:point val="14.5,5.4"/>
+        <dia:point val="-4.7899,7.405"/>
+        <dia:point val="-3.6274,7.405"/>
+        <dia:point val="-3.6274,10"/>
+        <dia:point val="-4.7999,10"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
         <dia:enum val="1"/>
+        <dia:enum val="0"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </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="O21" connection="7"/>
+        <dia:connection handle="1" to="O1" connection="2"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Dependency" version="1" id="O23">
+      <dia:attribute name="obj_pos">
+        <dia:point val="-8.8899,6.705"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="-11.6999,5.8775;-8.8399,7.4775"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="-8.8899,6.705"/>
+        <dia:point val="-9.6774,6.705"/>
+        <dia:point val="-9.6774,6.65"/>
+        <dia:point val="-11.2499,6.65"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
       </dia:attribute>
@@ -1098,22 +1111,22 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O23" connection="4"/>
-        <dia:connection handle="1" to="O10" connection="7"/>
+        <dia:connection handle="0" to="O21" connection="3"/>
+        <dia:connection handle="1" to="O2" connection="4"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O25">
+    <dia:object type="UML - Dependency" version="1" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.5451,19.695"/>
+        <dia:point val="-4.7899,6.705"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.9499,6.05;5.5951,19.745"/>
+        <dia:rectangle val="-4.8399,2.9;11.55,6.755"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="5.5451,19.695"/>
-        <dia:point val="-9.8999,19.695"/>
-        <dia:point val="-9.8999,6.5"/>
-        <dia:point val="-5.25,6.5"/>
+        <dia:point val="-4.7899,6.705"/>
+        <dia:point val="9.9226,6.705"/>
+        <dia:point val="9.9226,3.35"/>
+        <dia:point val="11.1,3.35"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -1123,6 +1136,9 @@
       <dia:attribute name="orth_autoroute">
         <dia:boolean val="false"/>
       </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
       <dia:attribute name="line_colour">
         <dia:color val="#000000"/>
       </dia:attribute>
@@ -1136,22 +1152,22 @@
         <dia:boolean val="true"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O23" connection="3"/>
-        <dia:connection handle="1" to="O1" connection="3"/>
+        <dia:connection handle="0" to="O21" connection="4"/>
+        <dia:connection handle="1" to="O4" connection="3"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - SmallPackage" version="0" id="O26">
+    <dia:object type="UML - SmallPackage" version="0" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="-14.5899,6.815"/>
+        <dia:point val="-13.8899,2.505"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-14.6399,5.865;-11.4899,8.265"/>
+        <dia:rectangle val="-13.9399,1.555;-11.3399,3.955"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-14.5899,6.815"/>
+        <dia:point val="-13.8899,2.505"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="3.0500000000000003"/>
+        <dia:real val="2.5"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="1.3999999999999999"/>
@@ -1160,7 +1176,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:attribute name="fill_colour">
-        <dia:color val="#ffffff"/>
+        <dia:color val="#00ff00"/>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -1168,7 +1184,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#wxMedia#</dia:string>
+            <dia:string>#wxSTC#</dia:string>
           </dia:attribute>
           <dia:attribute name="font">
             <dia:font family="monospace" style="0" name="Courier"/>
@@ -1177,7 +1193,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="-14.2899,7.665"/>
+            <dia:point val="-13.5899,3.3475"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1188,43 +1204,5 @@
         </dia:composite>
       </dia:attribute>
     </dia:object>
-    <dia:object type="UML - Dependency" version="0" id="O27">
-      <dia:attribute name="obj_pos">
-        <dia:point val="-11.5399,7.515"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="-11.5899,5.35;-4.8,7.565"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="-11.5399,7.515"/>
-        <dia:point val="-10.7999,7.515"/>
-        <dia:point val="-10.7999,5.8"/>
-        <dia:point val="-5.25,5.8"/>
-      </dia:attribute>
-      <dia:attribute name="orth_orient">
-        <dia:enum val="0"/>
-        <dia:enum val="1"/>
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="orth_autoroute">
-        <dia:boolean val="false"/>
-      </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="O26" connection="4"/>
-        <dia:connection handle="1" to="O1" connection="0"/>
-      </dia:connections>
-    </dia:object>
   </dia:layer>
 </dia:diagram>