non-pch build fixes

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

diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index 81139cb851b09bbee55c928534f3d3d9053d1039..f1b5a3f559567f08999bb097f51871f39ef082f3 100644 (file)
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -406,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>
@@ -970,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>
@@ -989,7 +1014,7 @@
                                     <message>Here goes a message</message>
                                     <style>wxFLP_OPEN</style>
                                     <wildcard>*.png</wildcard>
-                                    <default-path/>
+                                    <value/>
                                 </object>
                             </object>
                             <object class="sizeritem">
@@ -1004,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>
@@ -1022,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>