[lmi-commits] [6021] Gray out inapplicable toolbar buttons when no view is open

[Greg Chicares]

Revision: 6021
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6021
Author:   chicares
Date:     2014-11-05 18:50:10 +0000 (Wed, 05 Nov 2014)
Log Message:
-----------
Gray out inapplicable toolbar buttons when no view is open

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/gpt_view.cpp
    lmi/trunk/illustration_view.cpp
    lmi/trunk/mec_view.cpp
    lmi/trunk/skeleton.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2014-11-05 18:34:15 UTC (rev 6020)
+++ lmi/trunk/ChangeLog 2014-11-05 18:50:10 UTC (rev 6021)
@@ -34526,3 +34526,21 @@
 Improve cell-deletion speed. See:
   http://lists.nongnu.org/archive/html/lmi/2014-11/msg00004.html
 
+20141105T1834Z <address@hidden> [519]
+
+  census_view.cpp
+  gpt_view.cpp
+  illustration_view.cpp
+  mec_view.cpp
+  skeleton.cpp
+Reformat.
+
+20141105T1850Z <address@hidden> [517]
+
+  gpt_view.cpp
+  illustration_view.cpp
+  mec_view.cpp
+  skeleton.cpp
+Gray out inapplicable toolbar buttons when no view is open. See:
+  http://lists.nongnu.org/archive/html/lmi/2008-09/msg00036.html
+

Modified: lmi/trunk/gpt_view.cpp
===================================================================
--- lmi/trunk/gpt_view.cpp      2014-11-05 18:34:15 UTC (rev 6020)
+++ lmi/trunk/gpt_view.cpp      2014-11-05 18:50:10 UTC (rev 6021)
@@ -72,7 +72,6 @@
     EVT_UPDATE_UI(wxID_SAVE                     ,gpt_view::UponUpdateFileSave  
  )
     EVT_UPDATE_UI(wxID_SAVEAS                   
,gpt_view::UponUpdateFileSaveAs  )
     EVT_UPDATE_UI(XRCID("edit_cell"            
),gpt_view::UponUpdateProperties  )
-// There has to be a better way to inhibit these inapplicable ids.
     EVT_UPDATE_UI(XRCID("edit_class"           
),gpt_view::UponUpdateInapplicable)
     EVT_UPDATE_UI(XRCID("edit_case"            
),gpt_view::UponUpdateInapplicable)
     EVT_UPDATE_UI(XRCID("run_cell"             
),gpt_view::UponUpdateInapplicable)

Modified: lmi/trunk/illustration_view.cpp
===================================================================
--- lmi/trunk/illustration_view.cpp     2014-11-05 18:34:15 UTC (rev 6020)
+++ lmi/trunk/illustration_view.cpp     2014-11-05 18:50:10 UTC (rev 6021)
@@ -78,7 +78,6 @@
     EVT_UPDATE_UI(wxID_SAVE                     
,IllustrationView::UponUpdateFileSave    )
     EVT_UPDATE_UI(wxID_SAVEAS                   
,IllustrationView::UponUpdateFileSaveAs  )
     EVT_UPDATE_UI(XRCID("edit_cell"            
),IllustrationView::UponUpdateProperties  )
-// There has to be a better way to inhibit these inapplicable ids.
     EVT_UPDATE_UI(XRCID("edit_class"           
),IllustrationView::UponUpdateInapplicable)
     EVT_UPDATE_UI(XRCID("edit_case"            
),IllustrationView::UponUpdateInapplicable)
     EVT_UPDATE_UI(XRCID("run_cell"             
),IllustrationView::UponUpdateInapplicable)

Modified: lmi/trunk/mec_view.cpp
===================================================================
--- lmi/trunk/mec_view.cpp      2014-11-05 18:34:15 UTC (rev 6020)
+++ lmi/trunk/mec_view.cpp      2014-11-05 18:50:10 UTC (rev 6021)
@@ -72,7 +72,6 @@
     EVT_UPDATE_UI(wxID_SAVE                     ,mec_view::UponUpdateFileSave  
  )
     EVT_UPDATE_UI(wxID_SAVEAS                   
,mec_view::UponUpdateFileSaveAs  )
     EVT_UPDATE_UI(XRCID("edit_cell"            
),mec_view::UponUpdateProperties  )
-// There has to be a better way to inhibit these inapplicable ids.
     EVT_UPDATE_UI(XRCID("edit_class"           
),mec_view::UponUpdateInapplicable)
     EVT_UPDATE_UI(XRCID("edit_case"            
),mec_view::UponUpdateInapplicable)
     EVT_UPDATE_UI(XRCID("run_cell"             
),mec_view::UponUpdateInapplicable)

Modified: lmi/trunk/skeleton.cpp
===================================================================
--- lmi/trunk/skeleton.cpp      2014-11-05 18:34:15 UTC (rev 6020)
+++ lmi/trunk/skeleton.cpp      2014-11-05 18:50:10 UTC (rev 6021)
@@ -147,8 +147,6 @@
     EVT_MENU(XRCID("window_tile_horizontally"        
),Skeleton::UponWindowTileHorizontally       )
     EVT_MENU(XRCID("window_tile_vertically"          
),Skeleton::UponWindowTileVertically         )
     EVT_MENU_OPEN(                                     Skeleton::UponMenuOpen  
                   )
-// TODO ?? There has to be a better way.
-/*
     EVT_UPDATE_UI(XRCID("edit_cell"                  
),Skeleton::UponUpdateInapplicable           )
     EVT_UPDATE_UI(XRCID("edit_class"                 
),Skeleton::UponUpdateInapplicable           )
     EVT_UPDATE_UI(XRCID("edit_case"                  
),Skeleton::UponUpdateInapplicable           )
@@ -166,7 +164,6 @@
     EVT_UPDATE_UI(XRCID("delete_cells"               
),Skeleton::UponUpdateInapplicable           )
     EVT_UPDATE_UI(XRCID("column_width_varying"       
),Skeleton::UponUpdateInapplicable           )
     EVT_UPDATE_UI(XRCID("column_width_fixed"         
),Skeleton::UponUpdateInapplicable           )
-*/
 END_EVENT_TABLE()
 
 /// 'config_' can't be initialized in the initializer list with
@@ -1146,22 +1143,9 @@
     wxSafeShowMessage("Fatal error", "Terminating due to unhandled 
exception.");
 }
 
-// TODO ?? An unsuccessful experiment.
-void Skeleton::UponUpdateInapplicable(wxUpdateUIEvent& event)
+void Skeleton::UponUpdateInapplicable(wxUpdateUIEvent& e)
 {
-// This handler seems to override mdi childrens'.
-//    e.Enable(0 != frame_->GetChildren().GetCount());
-
-/*
-This doesn't undo that override.
     e.Enable(false);
-    if(0 != frame_->GetChildren().GetCount())
-        {
-        e.Skip();
-        }
-*/
-
-// Presumably we need to use ProcessEvent(), somehow.
 }
 
 void Skeleton::UponWindowCascade(wxCommandEvent&)