[lmi-commits] [5250] Fix defect introduced 20050312T0301Z

[Greg Chicares]

Revision: 5250
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5250
Author:   chicares
Date:     2011-08-14 23:32:36 +0000 (Sun, 14 Aug 2011)
Log Message:
-----------
Fix defect introduced 20050312T0301Z

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

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-08-14 14:16:19 UTC (rev 5249)
+++ lmi/trunk/ChangeLog 2011-08-14 23:32:36 UTC (rev 5250)
@@ -28259,3 +28259,22 @@
 Fix defect introduced 20050312T0301Z, from an original file predating
 the lmi epoch: wxID_CANCEL != false.
 
+20110814T1416Z <address@hidden> [632]
+
+  census_view.cpp
+  census_view.hpp
+  edit_mvc_docview_parameters.hpp
+  illustration_view.cpp
+  illustration_view.hpp
+  mec_view.cpp
+  mec_view.hpp
+  oecumenic_enumerations.hpp
+Prefer an enumerative return code.
+
+20110814T2332Z <address@hidden> [631]
+
+  census_view.cpp
+Fix defect introduced 20050312T0301Z, from an original file predating
+the lmi epoch: it's wasteful and confusing to test twice whether input
+changed.
+

Modified: lmi/trunk/census_view.cpp
===================================================================
--- lmi/trunk/census_view.cpp   2011-08-14 14:16:19 UTC (rev 5249)
+++ lmi/trunk/census_view.cpp   2011-08-14 23:32:36 UTC (rev 5250)
@@ -612,19 +612,11 @@
 void CensusView::UponEditCell(wxCommandEvent&)
 {
     int cell_number = selected_row();
-    Input& original_parms = cell_parms()[cell_number];
-    Input temp_parms(original_parms);
+    Input& modifiable_parms = cell_parms()[cell_number];
+    std::string const title = cell_title(cell_number);
 
-    if(oe_mvc_dv_cancelled == edit_parameters(temp_parms, 
cell_title(cell_number)))
+    if(oe_mvc_dv_changed == edit_parameters(modifiable_parms, title))
         {
-        return;
-        }
-
-    // TODO ?? Wouldn't it be better just to have edit_parameters()
-    // say whether it changed anything?
-    if(temp_parms != original_parms)
-        {
-        original_parms = temp_parms;
         Update();
         document().Modify(true);
         }
@@ -634,16 +626,12 @@
 {
     int cell_number = selected_row();
     std::string class_name = class_name_from_cell_number(cell_number);
-    Input& original_parms = *class_parms_from_class_name(class_name);
-    Input temp_parms(original_parms);
+    Input& modifiable_parms = *class_parms_from_class_name(class_name);
+    Input const unmodified_parms(modifiable_parms);
+    std::string const title = class_title(cell_number);
 
-    if(oe_mvc_dv_cancelled == edit_parameters(temp_parms, 
class_title(cell_number)))
+    if(oe_mvc_dv_changed == edit_parameters(modifiable_parms, title))
         {
-        return;
-        }
-
-    if(!(temp_parms == original_parms))
-        {
         int z = wxMessageBox
             ("Apply all changes to every cell in this class?"
             ,"Confirm changes"
@@ -651,9 +639,8 @@
             );
         if(wxYES == z)
             {
-            apply_changes(temp_parms, original_parms, true);
+            apply_changes(modifiable_parms, unmodified_parms, true);
             }
-        original_parms = temp_parms;
         Update();
         document().Modify(true);
         }
@@ -661,16 +648,12 @@
 
 void CensusView::UponEditCase(wxCommandEvent&)
 {
-    Input& original_parms = case_parms()[0];
-    Input temp_parms(original_parms);
+    Input& modifiable_parms = case_parms()[0];
+    Input const unmodified_parms(modifiable_parms);
+    std::string const title = "Default parameters for case";
 
-    if(oe_mvc_dv_cancelled == edit_parameters(temp_parms, "Default parameters 
for case"))
+    if(oe_mvc_dv_changed == edit_parameters(modifiable_parms, title))
         {
-        return;
-        }
-
-    if(!(temp_parms == original_parms))
-        {
         int z = wxMessageBox
             ("Apply all changes to every cell?"
             ,"Confirm changes"
@@ -678,9 +661,8 @@
             );
         if(wxYES == z)
             {
-            apply_changes(temp_parms, original_parms, false);
+            apply_changes(modifiable_parms, unmodified_parms, false);
             }
-        original_parms = temp_parms;
         Update();
         document().Modify(true);
         }