[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 53a288a 33/46: Restore "delete_cells" update
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 53a288a 33/46: Restore "delete_cells" update UI handler for CensusDVCView |
Date: |
Wed, 22 Jul 2020 11:05:15 -0400 (EDT) |
branch: master
commit 53a288a5860d2b52c29970912a20b52c15129f65
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Vadim Zeitlin <vadim@tt-solutions.com>
Restore "delete_cells" update UI handler for CensusDVCView
Keep using the same UponUpdateNonemptySelection() as in master, even if
it doesn't seem to be really necessary because the selection is actually
never empty for wxDataViewCtrl -- however this reduces the amount of
changes with the master version.
---
census_view.cpp | 21 ++++++++-------------
census_view.hpp | 4 +---
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/census_view.cpp b/census_view.cpp
index 841f283..51dfcca 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -1803,7 +1803,6 @@ BEGIN_EVENT_TABLE(CensusView, ViewEx)
EVT_UPDATE_UI(XRCID("copy_census"
),CensusView::UponUpdateColumnValuesVary )
EVT_UPDATE_UI(XRCID("paste_census"
),CensusView::UponUpdateAlwaysEnabled )
EVT_UPDATE_UI(XRCID("add_cell"
),CensusView::UponUpdateAlwaysEnabled )
- EVT_UPDATE_UI(XRCID("delete_cells"
),CensusView::UponUpdateAlwaysEnabled )
EVT_UPDATE_UI(XRCID("column_width_varying"
),CensusView::UponUpdateAlwaysEnabled )
EVT_UPDATE_UI(XRCID("column_width_fixed"
),CensusView::UponUpdateAlwaysEnabled )
// Disable these printing commands on the "File" menu: specialized
@@ -1817,12 +1816,13 @@ END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(CensusDVCView, CensusView)
BEGIN_EVENT_TABLE(CensusDVCView, CensusView)
- EVT_DATAVIEW_ITEM_CONTEXT_MENU (wxID_ANY ,CensusDVCView::UponRightClick
)
- EVT_DATAVIEW_ITEM_VALUE_CHANGED(wxID_ANY
,CensusDVCView::UponValueChanged )
- EVT_UPDATE_UI(XRCID("edit_cell"
),CensusDVCView::UponUpdateSingleSelection)
- EVT_UPDATE_UI(XRCID("edit_class"
),CensusDVCView::UponUpdateSingleSelection)
- EVT_UPDATE_UI(XRCID("run_cell"
),CensusDVCView::UponUpdateSingleSelection)
- EVT_UPDATE_UI(XRCID("run_class"
),CensusDVCView::UponUpdateSingleSelection)
+ EVT_DATAVIEW_ITEM_CONTEXT_MENU (wxID_ANY ,CensusDVCView::UponRightClick
)
+ EVT_DATAVIEW_ITEM_VALUE_CHANGED(wxID_ANY
,CensusDVCView::UponValueChanged )
+ EVT_UPDATE_UI(XRCID("edit_cell"
),CensusDVCView::UponUpdateSingleSelection )
+ EVT_UPDATE_UI(XRCID("edit_class"
),CensusDVCView::UponUpdateSingleSelection )
+ EVT_UPDATE_UI(XRCID("run_cell"
),CensusDVCView::UponUpdateSingleSelection )
+ EVT_UPDATE_UI(XRCID("run_class"
),CensusDVCView::UponUpdateSingleSelection )
+ EVT_UPDATE_UI(XRCID("delete_cells"
),CensusDVCView::UponUpdateNonemptySelection)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(CensusGridView, CensusView)
@@ -1835,6 +1835,7 @@ BEGIN_EVENT_TABLE(CensusGridView, CensusView)
EVT_UPDATE_UI(XRCID("edit_class"
),CensusGridView::UponUpdateAlwaysEnabled)
EVT_UPDATE_UI(XRCID("run_cell"
),CensusGridView::UponUpdateAlwaysEnabled)
EVT_UPDATE_UI(XRCID("run_class"
),CensusGridView::UponUpdateAlwaysEnabled)
+ EVT_UPDATE_UI(XRCID("delete_cells"
),CensusGridView::UponUpdateAlwaysEnabled)
END_EVENT_TABLE()
CensusView::CensusView()
@@ -2467,12 +2468,6 @@ void
CensusDVCView::UponUpdateNonemptySelection(wxUpdateUIEvent& e)
e.Enable(0 < list_window_->GetSelections(selection));
}
-void CensusGridView::UponUpdateNonemptySelection(wxUpdateUIEvent& e)
-{
- auto const& selected_rows = grid_window_->GetSelectedRows();
- e.Enable(!selected_rows.empty());
-}
-
/// Conditionally enable copying.
///
/// Copying is forbidden if it would produce only whitespace; i.e.,
diff --git a/census_view.hpp b/census_view.hpp
index 766979b..da39248 100644
--- a/census_view.hpp
+++ b/census_view.hpp
@@ -85,7 +85,6 @@ class CensusView
virtual void UponColumnWidthFixed (wxCommandEvent&) = 0;
void UponUpdateAlwaysDisabled (wxUpdateUIEvent&);
void UponUpdateAlwaysEnabled (wxUpdateUIEvent&);
- virtual void UponUpdateNonemptySelection(wxUpdateUIEvent&) = 0;
virtual void UponUpdateColumnValuesVary (wxUpdateUIEvent&) = 0;
bool DoAllCells(mcenum_emission);
@@ -159,7 +158,7 @@ class CensusDVCView final
void UponColumnWidthVarying (wxCommandEvent&) override;
void UponColumnWidthFixed (wxCommandEvent&) override;
void UponUpdateSingleSelection (wxUpdateUIEvent&);
- void UponUpdateNonemptySelection(wxUpdateUIEvent&) override;
+ void UponUpdateNonemptySelection(wxUpdateUIEvent&);
void UponUpdateColumnValuesVary (wxUpdateUIEvent&) override;
void Update() override;
@@ -200,7 +199,6 @@ class CensusGridView final
void UponDeleteCells (wxCommandEvent&) override;
void UponColumnWidthVarying (wxCommandEvent&) override;
void UponColumnWidthFixed (wxCommandEvent&) override;
- void UponUpdateNonemptySelection(wxUpdateUIEvent&) override;
void UponUpdateColumnValuesVary (wxUpdateUIEvent&) override;
void Update() override;
- [lmi-commits] [lmi] master 713d56f 46/46: Fix defect introduced 20200608T2219Z: warning not suppressed, (continued)
- [lmi-commits] [lmi] master 713d56f 46/46: Fix defect introduced 20200608T2219Z: warning not suppressed, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master 6281a6d 20/46: Make object returned by table_type_converter::get_impl() const, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master b85da3e 24/46: Clarify the comment about CensusViewDataViewModel wrappers, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master 5423df7 25/46: Remove separate table_type_converter::type(), Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master f82b136 31/46: Remove unnecessary make_cell_number_column_read_only() function, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master 9f1cb2e 39/46: Only auto-size columns when they change, not after each update, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master b3ac65b 43/46: Allow wxGrid to compute census view column sizes more efficiently, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master ece93a0 17/46: Make check for Alt-Enter more obvious in the code, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master b57ed4a 18/46: Remove deleted DatumSequenceEditor copy-related methods, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master 041ccfc 30/46: Optimize changing grid columns number too, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master 53a288a 33/46: Restore "delete_cells" update UI handler for CensusDVCView,
Greg Chicares <=
- [lmi-commits] [lmi] master 3c3d0c0 36/46: Explain grid customizations in the function creating it, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master 337d81f 37/46: Make UponDeleteCells() more efficient for large censuses, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master 2922db9 44/46: Disallow single cell operations when non-current row is selected, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master d337a22 45/46: Upgrade wx, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master c679655 19/46: Replace table_type_converter::get_all() with register_all(), Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master 7dc508e 35/46: Don't select the first row initially in the grid census view, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master 810de0a 26/46: Remove unnecessary wxGrid::IsCellEditControlEnabled() calls, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master adc4089 28/46: Optimize changing grid dimensions when pasting into the census, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master be4c2a4 32/46: Add a comment explaining why the first column is read-only, Greg Chicares, 2020/07/22
- [lmi-commits] [lmi] master b7944ba 38/46: Resize only columns, not rows, in update_visible_columns(), Greg Chicares, 2020/07/22