5.22

1 files changed, 17 insertions, 4 deletions

diff --git a/wx+/grid.h b/wx+/grid.h
index f93c0d3b..e8f62a12 100644
--- a/wx+/grid.h
+++ b/wx+/grid.h
@@ -94,9 +94,9 @@ public:
 
     //grid area
     virtual wxString getValue(size_t row, ColumnType colType) const = 0;
-    virtual void renderRowBackgound(wxDC& dc, const wxRect& rect, size_t row, bool enabled, bool selected, bool hasFocus); //default implementation
-    virtual void renderCell(Grid& grid, wxDC& dc, const wxRect& rect, size_t row, ColumnType colType); //
-    virtual int getBestSize(wxDC& dc, size_t row, ColumnType colType); //must correspond to renderCell()!
+    virtual void renderRowBackgound(wxDC& dc, const wxRect& rect, size_t row, bool enabled, bool selected); //default implementation
+    virtual void renderCell        (wxDC& dc, const wxRect& rect, size_t row, ColumnType colType, bool selected); //
+    virtual int  getBestSize       (wxDC& dc, size_t row, ColumnType colType); //must correspond to renderCell()!
     virtual wxString getToolTip(size_t row, ColumnType colType) const { return wxString(); }
 
     //label area
@@ -104,9 +104,11 @@ public:
     virtual void renderColumnLabel(Grid& grid, wxDC& dc, const wxRect& rect, ColumnType colType, bool highlighted); //default implementation
     virtual wxString getToolTip(ColumnType colType) const { return wxString(); }
 
+    static const int COLUMN_GAP_LEFT; //for left-aligned text
+
 protected: //optional helper routines
     static wxRect drawCellBorder  (wxDC& dc, const wxRect& rect); //returns inner rectangle
-    static void drawCellBackground(wxDC& dc, const wxRect& rect, bool enabled, bool selected, bool hasFocus, const wxColor& backgroundColor);
+    static void drawCellBackground(wxDC& dc, const wxRect& rect, bool enabled, bool selected, const wxColor& backgroundColor);
     static void drawCellText      (wxDC& dc, const wxRect& rect, const wxString& text, bool enabled, int alignment = wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
 
     static wxRect drawColumnLabelBorder  (wxDC& dc, const wxRect& rect); //returns inner rectangle
@@ -165,6 +167,7 @@ public:
     void showScrollBars(ScrollBarStatus horizontal, ScrollBarStatus vertical);
 
     std::vector<size_t> getSelectedRows(size_t compPos = 0) const;
+    void setSelectedRows(const std::vector<size_t>& sel, size_t compPos = 0);
     void clearSelection(bool emitSelectRangeEvent = true, size_t compPos = 0); //turn off range selection event when calling this function in an event handler to avoid recursion!
 
     void scrollDelta(int deltaX, int deltaY); //in scroll units
@@ -226,6 +229,8 @@ private:
     public:
         void init(size_t rowCount) { rowSelectionValue.resize(rowCount); clear(); }
 
+        size_t size() const { return rowSelectionValue.size(); }
+
         std::vector<size_t> get() const
         {
             std::vector<size_t> selection;
@@ -235,6 +240,14 @@ private:
             return selection;
         }
 
+        void set(const std::vector<size_t>& newSel)
+        {
+            clear();
+            for (size_t row : newSel)
+                if (row < rowSelectionValue.size())
+                    rowSelectionValue[row] = true;
+        }
+
         void clear() { selectRange(0, rowSelectionValue.size(), false); }
 
         bool isSelected(size_t row) const { return row < rowSelectionValue.size() ? rowSelectionValue[row] != 0 : false; }