Re: [lmi] Adding open files to MDI "Window" menu

[Greg Chicares]

On 2008-03-08 16:41Z, Greg Chicares wrote:
>
> Below is an experimental patch[1]

Accidentally omitted--here it is:

Index: illustration_view.cpp
===================================================================
RCS file: /sources/lmi/lmi/illustration_view.cpp,v
retrieving revision 1.74
diff -U 3 -r1.74 illustration_view.cpp
--- illustration_view.cpp       24 Feb 2008 12:42:12 -0000      1.74
+++ illustration_view.cpp       8 Mar 2008 17:26:23 -0000
@@ -78,7 +78,9 @@
     EVT_MENU(wxID_COPY                      ,IllustrationView::UponCopyFull)
     EVT_MENU(XRCID("preview_summary"       
),IllustrationView::UponPreviewSummary)
     EVT_MENU(XRCID("print_summary"         
),IllustrationView::UponPrintSummary)
+#if defined USE_OLD_WINDOW_MENU
     EVT_MENU_OPEN(                           IllustrationView::UponMenuOpen  )
+#endif // defined USE_OLD_WINDOW_MENU
     EVT_UPDATE_UI(wxID_SAVE                 
,IllustrationView::UponUpdateFileSave)
 //    EVT_UPDATE_UI(wxID_SAVEAS               
,IllustrationView::UponUpdateFileSaveAs)
 //    EVT_UPDATE_UI(XRCID("wxID_SAVEAS"      
),IllustrationView::UponUpdateFileSaveAs)
Index: main_wx.cpp
===================================================================
RCS file: /sources/lmi/lmi/main_wx.cpp,v
retrieving revision 1.101
diff -U 3 -r1.101 main_wx.cpp
--- main_wx.cpp 2 Mar 2008 03:07:23 -0000       1.101
+++ main_wx.cpp 8 Mar 2008 17:26:23 -0000
@@ -145,7 +145,9 @@
     EVT_MENU(XRCID("window_previous"                 
),Skeleton::UponWindowPrevious               )
     EVT_MENU(XRCID("window_tile_horizontally"        
),Skeleton::UponWindowTileHorizontally       )
     EVT_MENU(XRCID("window_tile_vertically"          
),Skeleton::UponWindowTileVertically         )
+#if defined USE_OLD_WINDOW_MENU
     EVT_MENU_OPEN(                                     Skeleton::UponMenuOpen  
                   )
+#endif // defined USE_OLD_WINDOW_MENU
     EVT_TIMER(wxID_ANY                                ,Skeleton::UponTimer     
                   )
 // TODO ?? expunge
 //  EVT_UPDATE_UI(wxID_ANY                            ,Skeleton::UponUpdateUI  
                   )
@@ -280,10 +282,16 @@
             frame_->GetActiveChild()
         &&  frame_->GetActiveChild()->IsMaximized()
         ;
+#if defined USE_OLD_WINDOW_MENU
     DocMDIChildFrameEx* child_frame = new DocMDIChildFrameEx
+#else // !defined USE_OLD_WINDOW_MENU
+    wxDocMDIChildFrame* child_frame = new wxDocMDIChildFrame
+#endif // !defined USE_OLD_WINDOW_MENU
         (doc
         ,view
         ,frame_
+        ,wxID_ANY
+        ,"Loading..."
         );
     child_frame->SetIcon(view->Icon());
     child_frame->SetMenuBar(AdjustMenus(view->MenuBar()));
@@ -642,7 +650,9 @@
             ,wxDefaultPosition
             ,wxDefaultSize
             ,   wxDEFAULT_FRAME_STYLE
+#if defined USE_OLD_WINDOW_MENU
             |   wxFRAME_NO_WINDOW_MENU
+#endif // defined USE_OLD_WINDOW_MENU
             |   wxHSCROLL
             |   wxVSCROLL
             );
Index: menus.xrc
===================================================================
RCS file: /sources/lmi/lmi/menus.xrc,v
retrieving revision 1.36
diff -U 3 -r1.36 menus.xrc
--- menus.xrc   2 Mar 2008 03:07:23 -0000       1.36
+++ menus.xrc   8 Mar 2008 17:26:23 -0000
@@ -201,8 +201,9 @@
     </object>
 </object>

+<!-- USE_OLD_WINDOW_MENU -->
 <object class="wxMenu" name="window_menu_ref">
-    <label>_Window</label>
+    <label>_OldWindow</label>
     <!-- "Arrange icons", though available, is silly. -->
     <object class="wxMenuItem" name="window_cascade">
         <label>_Cascade</label>