Avoid incompatible operand types

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

diff --git a/samples/xrc/rc/menu.xrc b/samples/xrc/rc/menu.xrc
index 64d3ccbf04069424992a2be72b67cf6c3c6df3fe..309aaab9abfbc74a64e907fad76d4a049d9a2684 100644 (file)
--- a/samples/xrc/rc/menu.xrc
+++ b/samples/xrc/rc/menu.xrc
@@ -1,13 +1,23 @@
 <?xml version="1.0"?>
 
-<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.3.0.1">
 
 <object class="wxMenuBar" name="main_menu">
 <style>wxMB_DOCKABLE</style>
     <object class="wxMenu" name="file_tool_or_menuitem">
         <label>_File</label>
         <style>wxMENU_TEAROFF</style>
-        <object class="wxMenuItem" name="exit_tool_or_menuitem">
+        <object class="wxMenuItem" name="unload_resource_menuitem">
+            <label>_Unload resource\tCtrl-U</label>
+            <help>Unload basic dialog resource</help>
+        </object>
+        <object class="wxMenuItem" name="reload_resource_menuitem">
+            <label>_Reload resource\tCtrl-R</label>
+            <help>Reload basic dialog resource</help>
+        </object>
+
+        <!-- we use wxID_EXIT name here to get the default menu item stock icon -->
+        <object class="wxMenuItem" name="wxID_EXIT">
             <label>E_xit\tAlt-X</label>
             <help>Exit this application</help>
         </object>
@@ -28,7 +38,7 @@
         <object class="wxMenuItem" name="controls_tool_or_menuitem">
             <label>_Controls Example</label>
             <bitmap>controls.xpm</bitmap>
-            <help>A notebook displaying all the wxWindows controls</help>
+            <help>A notebook displaying all the wxWidgets controls</help>
         </object>        
         <object class="wxMenuItem" name="uncentered_tool_or_menuitem">
             <label>_Uncentered Example</label>
@@ -39,6 +49,11 @@
     <object class="wxMenu" name="advanced_demos_menu">
         <label>_Advanced</label>
         <help>Advanced techniques with XRC</help>
+         <object class="wxMenuItem" name="obj_ref_tool_or_menuitem">
+            <label>_Object References Example</label>
+            <bitmap>objrefdlg.xpm</bitmap>
+            <help>Use of object references and event ranges</help>
+        </object>
          <object class="wxMenuItem" name="custom_class_tool_or_menuitem">
             <label>_Custom Class Example</label>
             <bitmap>custclas.xpm</bitmap>
@@ -59,10 +74,16 @@
             <bitmap>variable.xpm</bitmap>
             <help>Replace variables in the XRC file at runtime</help>
         </object>        
+        <object class="wxMenuItem" name="recursive_load">
+            <label>_Recursive Load</label>
+            <help>Show how an individual control can be loaded</help>
+        </object>
     </object>    
     <object class="wxMenu" name="help_menu">
         <label>_Help</label>
-        <object class="wxMenuItem" name="about_tool_or_menuitem">
+
+        <!-- we use wxID_ABOUT name here to get the default menu item stock icon -->
+        <object class="wxMenuItem" name="wxID_ABOUT">
             <label>_About...</label>
             <help>About this application</help>
         </object>