[ 1505048 ] wxHtml rendering of underlined text

[wxWidgets.git] / samples / xrc / rc / controls.xrc

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index f834b6a1a113f32e2a9a5e1313c123d46c6c7d19..2a92ca13625a11c7d4fe2abeecb585e52e9b9c10 100644 (file)
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <?xml version="1.0" encoding="ISO-8859-1"?>
 

+<!-- $Id$ -->
+

 <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxDialog" name="controls_dialog">
 <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxDialog" name="controls_dialog">


@@ -127,6 +129,13 @@
                                             <item>in the toolbar</item>
                                         </content>
                                     </object>
                                             <item>in the toolbar</item>
                                         </content>
                                     </object>

+                                    <object class="wxOwnerDrawnComboBox">
+                                        <content>
+                                            <item>Owner Drawn</item>
+                                            <item>combobox</item>
+                                            <item>in the toolbar</item>
+                                        </content>
+                                    </object>

                                 </object>
                             </object>
                             <object class="sizeritem">
                                 </object>
                             </object>
                             <object class="sizeritem">


@@ -191,13 +200,20 @@
                                             <item>in the toolbar</item>
                                         </content>
                                     </object>
                                             <item>in the toolbar</item>
                                         </content>
                                     </object>

+                                    <object class="wxOwnerDrawnComboBox">
+                                        <content>
+                                            <item>Owner Drawn</item>
+                                            <item>combobox</item>
+                                            <item>in the toolbar</item>
+                                        </content>
+                                    </object>

                                 </object>
                             </object>
                         </object>
                     </object>
                 </object>
 
                                 </object>
                             </object>
                         </object>
                     </object>
                 </object>
 

-                
+

                 <object class="notebookpage">
                     <label>wxBitmapButton</label>
                     <object class="wxPanel" name="bitmapbutton">
                 <object class="notebookpage">
                     <label>wxBitmapButton</label>
                     <object class="wxPanel" name="bitmapbutton">


@@ -482,7 +498,7 @@
                                     I dream things that never were, and say why not"&lt;/i&gt;
                                     &lt;p&gt;&lt;pre&gt;Fixed width for code snippets.&lt;/pre&gt;
                                     &lt;p&gt;Horizontal rules to organize sections: &lt;hr&gt;
                                     I dream things that never were, and say why not"&lt;/i&gt;
                                     &lt;p&gt;&lt;pre&gt;Fixed width for code snippets.&lt;/pre&gt;
                                     &lt;p&gt;Horizontal rules to organize sections: &lt;hr&gt;

-                                    &lt;p&gt;A wxImage is worth a thousand words and can be also used.                            
+                                    &lt;p&gt;A wxImage is worth a thousand words and can be also used.

                                 </htmlcode>
                                 </object>
                             </object>
                                 </htmlcode>
                                 </object>
                             </object>


@@ -954,7 +970,7 @@
                                 <option>1</option>
                                 <border>5</border>
                                 <object class="wxColourPickerCtrl" name="controls_colourpicker">
                                 <option>1</option>
                                 <border>5</border>
                                 <object class="wxColourPickerCtrl" name="controls_colourpicker">

-                                    <colour>#00ff00</colour>
+                                    <value>#00ff00</value>

                                     <style>wxCLRP_SHOW_LABEL</style>
                                 </object>
                             </object>
                                     <style>wxCLRP_SHOW_LABEL</style>
                                 </object>
                             </object>


@@ -973,7 +989,7 @@
                                     <message>Here goes a message</message>
                                     <style>wxFLP_OPEN</style>
                                     <wildcard>*.png</wildcard>
                                     <message>Here goes a message</message>
                                     <style>wxFLP_OPEN</style>
                                     <wildcard>*.png</wildcard>

-                                    <default-path/>
+                                    <value/>

                                 </object>
                             </object>
                             <object class="sizeritem">
                                 </object>
                             </object>
                             <object class="sizeritem">


@@ -988,7 +1004,7 @@
                                 <option>1</option>
                                 <border>5</border>
                                 <object class="wxDirPickerCtrl" name="controls_dirpicker">
                                 <option>1</option>
                                 <border>5</border>
                                 <object class="wxDirPickerCtrl" name="controls_dirpicker">

-                                    <default-path/>
+                                    <value/>

                                     <style>wxDIRP_CHANGE_DIR</style>
                                     <message>Here goes a message</message>
                                 </object>
                                     <style>wxDIRP_CHANGE_DIR</style>
                                     <message>Here goes a message</message>
                                 </object>


@@ -1006,10 +1022,10 @@
                                 <border>5</border>
                                 <object class="wxFontPickerCtrl" name="controls_fontpicker">
                                     <style>wxFNTP_USEFONT_FOR_LABEL</style>
                                 <border>5</border>
                                 <object class="wxFontPickerCtrl" name="controls_fontpicker">
                                     <style>wxFNTP_USEFONT_FOR_LABEL</style>

-                                    <default-font>
+                                    <value>

                                         <size>20</size>
                                         <sysfont>wxSYS_DEFAULT_GUI_FONT</sysfont>
                                         <size>20</size>
                                         <sysfont>wxSYS_DEFAULT_GUI_FONT</sysfont>

-                                    </default-font>
+                                    </value>

                                 </object>
                             </object>
                         </object>
                                 </object>
                             </object>
                         </object>