[lmi-commits] [6362] Refactor

[Greg Chicares]

Revision: 6362
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6362
Author:   chicares
Date:     2015-10-18 16:12:51 +0000 (Sun, 18 Oct 2015)
Log Message:
-----------
Refactor

Modified Paths:
--------------
    lmi/trunk/menus.xrc

Modified: lmi/trunk/menus.xrc
===================================================================
--- lmi/trunk/menus.xrc 2015-10-18 16:11:32 UTC (rev 6361)
+++ lmi/trunk/menus.xrc 2015-10-18 16:12:51 UTC (rev 6362)
@@ -29,6 +29,11 @@
 
 <!-- reusable menus -->
 
+<!--
+  This 'File' menu includes commands to save, close, and print documents.
+  Use it when the current document uses these print commands.
+-->
+
 <object class="wxMenu" name="file_menu_with_print_ref">
     <label>_File</label>
     <object class="wxMenuItem" name="wxID_NEW">
@@ -97,6 +102,11 @@
     </object>
 </object>
 
+<!--
+  This 'File' menu excludes commands to print documents.
+  Use it when the current document does not use these print commands.
+-->
+
 <object class="wxMenu" name="file_menu_without_print_ref">
     <label>_File</label>
     <object class="wxMenuItem" name="wxID_NEW">
@@ -144,6 +154,42 @@
     </object>
 </object>
 
+<!--
+  This 'File' menu excludes commands to save, close, and print documents.
+  Use it when no document is open in a child window.
+-->
+
+<object class="wxMenu" name="file_menu_without_child_ref">
+    <label>_File</label>
+    <object class="wxMenuItem" name="wxID_NEW">
+        <label>_New\tCtrl-N</label>
+        <bitmap platform="win" stock_id="wxART_NEW"/>
+        <help>Create a new document</help>
+    </object>
+    <object class="wxMenuItem" name="wxID_OPEN">
+        <label>_Open...\tCtrl-O</label>
+        <bitmap platform="win" stock_id="wxART_FILE_OPEN"/>
+        <help>Open an existing document</help>
+    </object>
+    <object class="separator"/>
+    <object class="wxMenuItem" name="edit_default_cell">
+        <label>Defaul_t\tCtrl-T</label>
+        <bitmap platform="win" stock_id="default-cell"/>
+        <help>Edit default cell</help>
+    </object>
+    <object class="wxMenuItem" name="wxID_PREFERENCES">
+        <label>Pre_ferences\tCtrl-F</label>
+        <bitmap platform="win" stock_id="preferences"/>
+        <help>Manage preferences</help>
+    </object>
+    <object class="separator"/>
+    <object class="wxMenuItem" name="wxID_EXIT">
+        <label>E_xit</label>
+        <bitmap platform="win" stock_id="wxART_QUIT"/>
+        <help>Exit this program</help>
+    </object>
+</object>
+
 <object class="wxMenu" name="test_menu_ref">
     <label>_Test</label>
     <object class="wxMenu">
@@ -251,46 +297,11 @@
     </object>
 </object>
 
-<!-- main menu -->
+<!-- main menu used when no document is open in a child window -->
 
-<!--
-  The 'File' menu here is briefer than the one used elsewhere. For
-  example, it makes no sense to offer a 'Save' option when no child
-  window exists.
--->
-
 <object class="wxMenuBar" name="main_menu">
 <style>wxMB_DOCKABLE</style>
-    <object class="wxMenu">
-        <label>_File</label>
-        <object class="wxMenuItem" name="wxID_NEW">
-            <label>_New\tCtrl-N</label>
-            <bitmap platform="win" stock_id="wxART_NEW"/>
-            <help>Create a new document</help>
-        </object>
-        <object class="wxMenuItem" name="wxID_OPEN">
-            <label>_Open...\tCtrl-O</label>
-            <bitmap platform="win" stock_id="wxART_FILE_OPEN"/>
-            <help>Open an existing document</help>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="edit_default_cell">
-            <label>Defaul_t\tCtrl-T</label>
-            <bitmap platform="win" stock_id="default-cell"/>
-            <help>Edit default cell</help>
-        </object>
-        <object class="wxMenuItem" name="wxID_PREFERENCES">
-            <label>Pre_ferences\tCtrl-F</label>
-            <bitmap platform="win" stock_id="preferences"/>
-            <help>Manage preferences</help>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="wxID_EXIT">
-            <label>E_xit</label>
-            <bitmap platform="win" stock_id="wxART_QUIT"/>
-            <help>Exit this program</help>
-        </object>
-    </object>
+    <object_ref name="file_menu" ref="file_menu_without_child_ref"/>
     <object_ref name="test_menu" ref="test_menu_ref"/>
     <object_ref name="wxID_HELP" ref="help_menu_ref"/>
 </object>