X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/188cb2af4f16905cb6ea895ecb595e47d20d3e5e..ad0023978e7a61369f3180241f217df283308388:/samples/xrc/rc/controls.xrc

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index f834b6a1a1..f1b5a3f559 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -1,5 +1,7 @@
 <?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">
@@ -127,6 +129,13 @@
                                             <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">
@@ -191,13 +200,20 @@
                                             <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 class="notebookpage">
                     <label>wxBitmapButton</label>
                     <object class="wxPanel" name="bitmapbutton">
@@ -390,6 +406,31 @@
                                     </content>
                                 </object>
                             </object>
+                            <object class="sizeritem">
+                                <flag>wxALIGN_TOP|wxALIGN_CENTRE_HORIZONTAL|wxALL</flag>
+                                <border>5</border>
+                                <object class="wxBitmapComboBox">
+                                    <size>200,-1</size>
+                                    <style>wxCB_READONLY</style>
+                                    <selection>2</selection>
+                                    <object class="ownerdrawnitem">
+										<text>This is a</text>
+										<bitmap>basicdlg.xpm</bitmap>
+									 </object>
+                                    <object class="ownerdrawnitem">
+										<text>read-only</text>
+										<bitmap>derivdlg.xpm</bitmap>
+									 </object>
+                                    <object class="ownerdrawnitem">
+										<text>wxBitmapComboBox</text>
+										<bitmap>uncenter.xpm</bitmap>
+									 </object>
+                                    <object class="ownerdrawnitem">
+										<text>control</text>
+										<bitmap>custclas.xpm</bitmap>
+									</object>
+                                </object>
+                            </object>
                         </object>
                     </object>
                 </object>
@@ -482,7 +523,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;
-                                    &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>
@@ -954,7 +995,7 @@
                                 <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>
@@ -973,7 +1014,7 @@
                                     <message>Here goes a message</message>
                                     <style>wxFLP_OPEN</style>
                                     <wildcard>*.png</wildcard>
-                                    <default-path/>
+                                    <value/>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -988,7 +1029,7 @@
                                 <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>
@@ -1006,10 +1047,10 @@
                                 <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>
-                                    </default-font>
+                                    </value>
                                 </object>
                             </object>
                         </object>