1.14

1 files changed, 6 insertions, 13 deletions

diff --git a/library/CustomGrid.h b/library/CustomGrid.h
index 3547b090..bd2f3fa8 100644
--- a/library/CustomGrid.h
+++ b/library/CustomGrid.h
@@ -12,7 +12,7 @@ class CustomGridTableBase;
 
 //##################################################################################
 
-extern int leadingPanel;
+extern const wxGrid* leadGrid; //this global variable is not very nice...
 
 class CustomGrid : public wxGrid
 {
@@ -26,27 +26,20 @@ public:
 
     ~CustomGrid();
 
-    bool CreateGrid(int numRows, int numCols, wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells);
-
-    void deactivateScrollbars();
-
+    virtual bool CreateGrid(int numRows, int numCols, wxGrid::wxGridSelectionModes selmode = wxGrid::wxGridSelectCells);
     //overwrite virtual method to finally get rid of the scrollbars
-    void SetScrollbar(int orientation, int position, int thumbSize, int range, bool refresh = true);
-
+    virtual void SetScrollbar(int orientation, int position, int thumbSize, int range, bool refresh = true);
     //this method is called when grid view changes: useful for parallel updating of multiple grids
-    void DoPrepareDC(wxDC& dc);
+    virtual void DoPrepareDC(wxDC& dc);
+    virtual void DrawColLabel(wxDC& dc, int col);
 
+    void deactivateScrollbars();
     void setScrollFriends(CustomGrid* gridLeft, CustomGrid* gridRight, CustomGrid* gridMiddle);
-
     void setGridDataTable(GridView* gridRefUI, FileCompareResult* gridData);
-
     void updateGridSizes();
-
     //set sort direction indicator on UI
     void setSortMarker(const int sortColumn, const wxBitmap* bitmap = &wxNullBitmap);
 
-    void DrawColLabel(wxDC& dc, int col);
-
 private:
     void adjustGridHeights();