summaryrefslogtreecommitdiff
path: root/wx+/grid.h
diff options
context:
space:
mode:
authorDaniel Wilhelm <shieldwed@outlook.com>2019-12-30 10:35:19 +0000
committerDaniel Wilhelm <shieldwed@outlook.com>2019-12-30 10:35:19 +0000
commitf790cdc5775bb1234a9c2666218456d80825966e (patch)
treecf344e045d5ebdffe0afc35f2de68b8908857808 /wx+/grid.h
parentMerge branch '10.18' into 'master' (diff)
parentadd upstream 10.19 (diff)
downloadFreeFileSync-f790cdc5775bb1234a9c2666218456d80825966e.tar.gz
FreeFileSync-f790cdc5775bb1234a9c2666218456d80825966e.tar.bz2
FreeFileSync-f790cdc5775bb1234a9c2666218456d80825966e.zip
Merge branch '10.19' into 'master'10.19
add upstream 10.19 See merge request opensource-tracking/FreeFileSync!16
Diffstat (limited to 'wx+/grid.h')
-rw-r--r--wx+/grid.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/wx+/grid.h b/wx+/grid.h
index 74dc25b2..662c4fc1 100644
--- a/wx+/grid.h
+++ b/wx+/grid.h
@@ -115,7 +115,7 @@ public:
//label area:
virtual std::wstring getColumnLabel(ColumnType colType) const = 0;
- virtual void renderColumnLabel(Grid& grid, wxDC& dc, const wxRect& rect, ColumnType colType, bool highlighted); //default implementation
+ virtual void renderColumnLabel(wxDC& dc, const wxRect& rect, ColumnType colType, bool enabled, bool highlighted); //default implementation
virtual std::wstring getToolTip(ColumnType colType) const { return std::wstring(); }
static int getColumnGapLeft(); //for left-aligned text
@@ -128,7 +128,7 @@ public:
static void drawCellBackground(wxDC& dc, const wxRect& rect, bool enabled, bool selected, const wxColor& backgroundColor);
static wxRect drawColumnLabelBackground(wxDC& dc, const wxRect& rect, bool highlighted); //returns inner rectangle
- static void drawColumnLabelText (wxDC& dc, const wxRect& rect, const std::wstring& text);
+ static void drawColumnLabelText (wxDC& dc, const wxRect& rect, const std::wstring& text, bool enabled);
};
bgstack15