diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 9932513d4d..4c0ed3e73f 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -685,7 +685,11 @@ public:
     void DrawCellBorder( wxDC& dc, const wxGridCellCoords& );
     void DrawAllGridLines( wxDC& dc, const wxRegion & reg );
     void DrawCell( wxDC& dc, const wxGridCellCoords& );
-    void DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr );
+    void DrawHighlight(wxDC& dc);
+
+    // this function is called when the current cell highlight must be redrawn
+    // and may be overridden by the user
+    virtual void DrawCellHighlight( wxDC& dc, const wxGridCellAttr *attr );
 
     void DrawRowLabels( wxDC& dc );
     void DrawRowLabel( wxDC& dc, int row );
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index faeb6fcc13..9e0952c3b5 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Name:        grid.cpp
+// Name:        generic/grid.cpp
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: