1. removed 3d border, but

 a) made DrawCellHighlight() virtual to allow overriding it in user code
 b) fixed bug with grid lines painting over the border, so it should really
    work now
2. char events to readonly cells are Skip()ped which makes Alt-X work for
   them too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 9932513d4d9e80ebec886614af00d5a35db4127a..4c0ed3e73f08bc4ecb24cbf8ddbb17384d9a2c30 100644 (file)
--- 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 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 );
 
     void DrawRowLabels( wxDC& dc );
     void DrawRowLabel( wxDC& dc, int row );

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index faeb6fcc13faed87cb0e8691d6e5dfe36ad88af0..9e0952c3b5b68c7613ef1cd53c9fc0617aa4f9a6 100644 (file)
--- 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:
 // Purpose:     wxGrid and related classes
 // Author:      Michael Bedward (based on code by Julian Smart, Robin Dunn)
 // Modified by: