[lmi-commits] [5241] Disable deletion if no cell is selected

[Greg Chicares]

Revision: 5241
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5241
Author:   chicares
Date:     2011-08-11 12:38:18 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
Disable deletion if no cell is selected

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/census_view.cpp
    lmi/trunk/census_view.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-08-11 12:22:36 UTC (rev 5240)
+++ lmi/trunk/ChangeLog 2011-08-11 12:38:18 UTC (rev 5241)
@@ -28187,3 +28187,28 @@
 Use fixed column width by default. See:
   http://lists.nongnu.org/archive/html/lmi/2011-07/msg00029.html
 
+20110811T0936Z <address@hidden> [637]
+
+  census_view.cpp
+Fix model notifications in CensusView::UponDeleteCells() (VS). See:
+  http://lists.nongnu.org/archive/html/lmi/2011-08/msg00039.html
+
+20110811T0953Z <address@hidden> [637]
+
+  census_view.cpp
+After deletion, select one cell (VS). See:
+  http://lists.nongnu.org/archive/html/lmi/2011-08/msg00041.html
+
+20110811T1222Z <address@hidden> [637]
+
+  census_view.cpp
+After deletion, ensure selected cell is visible. See:
+  http://lists.nongnu.org/archive/html/lmi/2011-08/msg00044.html
+
+20110811T1238Z <address@hidden> [637]
+
+  census_view.cpp
+  census_view.hpp
+Disable deletion if no cell is selected. See:
+  http://lists.nongnu.org/archive/html/lmi/2011-08/msg00044.html
+

Modified: lmi/trunk/census_view.cpp
===================================================================
--- lmi/trunk/census_view.cpp   2011-08-11 12:22:36 UTC (rev 5240)
+++ lmi/trunk/census_view.cpp   2011-08-11 12:38:18 UTC (rev 5241)
@@ -169,7 +169,7 @@
     EVT_UPDATE_UI(XRCID("print_spreadsheet"    
),CensusView::UponUpdateApplicable)
     EVT_UPDATE_UI(XRCID("paste_census"         
),CensusView::UponUpdateApplicable)
     EVT_UPDATE_UI(XRCID("add_cell"             
),CensusView::UponUpdateApplicable)
-    EVT_UPDATE_UI(XRCID("delete_cells"         
),CensusView::UponUpdateApplicable)
+    EVT_UPDATE_UI(XRCID("delete_cells"         
),CensusView::UponUpdateNonemptySelection)
     EVT_UPDATE_UI(XRCID("column_width_varying" 
),CensusView::UponUpdateApplicable)
     EVT_UPDATE_UI(XRCID("column_width_fixed"   
),CensusView::UponUpdateApplicable)
 END_EVENT_TABLE()
@@ -746,6 +746,13 @@
     e.Enable(is_single_sel);
 }
 
+void CensusView::UponUpdateNonemptySelection(wxUpdateUIEvent& e)
+{
+    wxDataViewItemArray selection;
+    unsigned int n_sel_items = list_window_->GetSelections(selection);
+    e.Enable(0 < n_sel_items);
+}
+
 /// Update the dataview display.
 ///
 /// If a parameter was formerly the same for all cells but now differs due
@@ -879,6 +886,8 @@
     wxDataViewItemArray selection;
     unsigned int n_sel_items = list_window_->GetSelections(selection);
     LMI_ASSERT(n_sel_items == selection.size());
+    // This handler should have been disabled if no cell is selected.
+    LMI_ASSERT(0 < n_sel_items);
 
     if(n_items == n_sel_items)
         {

Modified: lmi/trunk/census_view.hpp
===================================================================
--- lmi/trunk/census_view.hpp   2011-08-11 12:22:36 UTC (rev 5240)
+++ lmi/trunk/census_view.hpp   2011-08-11 12:38:18 UTC (rev 5241)
@@ -85,6 +85,7 @@
     void UponRunCaseToSpreadsheet   (wxCommandEvent&);
     void UponUpdateApplicable       (wxUpdateUIEvent&);
     void UponUpdateSingleItemActions(wxUpdateUIEvent&);
+    void UponUpdateNonemptySelection(wxUpdateUIEvent&);
 
     bool DoAllCells(mcenum_emission);