[lmi-commits] [lmi] master c9d6ebc 5/6: Add UponPasteCensusOut() to event table

[Greg Chicares]

branch: master
commit c9d6ebc2eb125755c19977451a97a5dab6ae70be
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Add UponPasteCensusOut() to event table
    
    As suspected, the event handler had to be made non-const; accordingly,
    factored the entire implementation out into a const auxiliary function.
---
 census_view.cpp | 15 ++++++++++++---
 census_view.hpp |  4 +++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/census_view.cpp b/census_view.cpp
index b8f502c..3e4aa35 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -862,6 +862,7 @@ BEGIN_EVENT_TABLE(CensusView, ViewEx)
     EVT_MENU(XRCID("print_group_roster"        
),CensusView::UponRunCaseToGroupRoster   )
     EVT_MENU(XRCID("print_group_quote"         
),CensusView::UponRunCaseToGroupQuote    )
     EVT_MENU(XRCID("paste_census"              ),CensusView::UponPasteCensusIn 
         )
+    EVT_MENU(XRCID("paste_census_out"          
),CensusView::UponPasteCensusOut         )
     EVT_MENU(XRCID("add_cell"                  ),CensusView::UponAddCell       
         )
     EVT_MENU(XRCID("delete_cells"              ),CensusView::UponDeleteCells   
         )
     EVT_MENU(XRCID("column_width_varying"      
),CensusView::UponColumnWidthVarying     )
@@ -1354,8 +1355,7 @@ void CensusView::UponRightClick(wxDataViewEvent& e)
     global_settings const& g = global_settings::instance();
     if(contains(g.pyx(), "paste_out_to_spreadsheet"))
         {
-        wxCommandEvent temporary_okay_in_code_to_be_erased_soon;
-        UponPasteCensusOut(temporary_okay_in_code_to_be_erased_soon);
+        DoPasteCensusOut();
         }
 }
 
@@ -1778,6 +1778,15 @@ void CensusView::UponPasteCensusIn(wxCommandEvent&)
 
 /// Paste from the census manager into a "spreadsheet" (TSV) file.
 ///
+/// Simply calls DoPasteCensusOut(), q.v.
+
+void CensusView::UponPasteCensusOut(wxCommandEvent&)
+{
+    DoPasteCensusOut();
+}
+
+/// Paste from the census manager into a "spreadsheet" (TSV) file.
+///
 /// Include exactly those columns whose rows aren't all identical,
 /// considering as "rows" the individual cells--and also the case
 /// defaults, even though they aren't displayed in any row.
@@ -1800,7 +1809,7 @@ void CensusView::UponPasteCensusIn(wxCommandEvent&)
 /// spreadsheet program, and lmi's own UponPasteCensusIn() all ignore
 /// the extra '\t'.
 
-void CensusView::UponPasteCensusOut(wxCommandEvent&) const
+void CensusView::DoPasteCensusOut() const
 {
     configurable_settings const& c = configurable_settings::instance();
     std::string const& e = c.spreadsheet_file_extension();
diff --git a/census_view.hpp b/census_view.hpp
index 5dcb8a1..af2fb47 100644
--- a/census_view.hpp
+++ b/census_view.hpp
@@ -73,7 +73,7 @@ class CensusView final
     void UponColumnWidthVarying     (wxCommandEvent&);
     void UponColumnWidthFixed       (wxCommandEvent&);
     void UponPasteCensusIn          (wxCommandEvent&);
-    void UponPasteCensusOut         (wxCommandEvent&) const;
+    void UponPasteCensusOut         (wxCommandEvent&);
     void UponRightClick             (wxDataViewEvent&);
     void UponPrintCase              (wxCommandEvent&);
     void UponPrintCaseToDisk        (wxCommandEvent&);
@@ -125,6 +125,8 @@ class CensusView final
 
     void update_class_names();
 
+    void DoPasteCensusOut() const;
+
     bool autosize_columns_;
 
     std::shared_ptr<Ledger const> composite_ledger_;