From 6a9dea37f78005239ab26b447256da42bebffc04 Mon Sep 17 00:00:00 2001
From: Pavel Kalugin <p.kalugin@gmail.com>
Date: Wed, 5 Sep 2018 18:34:07 +0300
Subject: [PATCH] Rename a class to restore backward compatibility

This solves backward incompatibility problem introduced in 2d8bbbe3c9.
The name of base class for grid header renderers hierarchy is restored
to be wxGridHeaderLabelsRenderer. This introduces another problem: now
wxGridCornerHeaderRenderer is derived from wxGridHeaderLabelsRenderer,
not vice versa, as it was before. But it is considered less disruptive
change, compared to base class rename.
---
 include/wx/generic/grid.h | 12 ++++++------
 interface/wx/grid.h       | 14 +++++++-------
 src/generic/grid.cpp      |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index dd4791be10..84e283154d 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -326,10 +326,10 @@ protected:
 // ----------------------------------------------------------------------------
 
 // Base class for header cells renderers.
-class WXDLLIMPEXP_CORE wxGridHeaderCellRenderer
+class WXDLLIMPEXP_CORE wxGridHeaderLabelsRenderer
 {
 public:
-    virtual ~wxGridHeaderCellRenderer() {}
+    virtual ~wxGridHeaderLabelsRenderer() {}
 
     // Draw the border around cell window.
     virtual void DrawBorder(const wxGrid& grid,
@@ -347,21 +347,21 @@ public:
 };
 
 // Currently the row/column/corner renders don't need any methods other than
-// those already in wxGridHeaderCellRenderer but still define separate classes
+// those already in wxGridHeaderLabelsRenderer but still define separate classes
 // for them for future extensions and also for better type safety (i.e. to
 // avoid inadvertently using a column header renderer for the row headers)
 class WXDLLIMPEXP_CORE wxGridRowHeaderRenderer
-    : public wxGridHeaderCellRenderer
+    : public wxGridHeaderLabelsRenderer
 {
 };
 
 class WXDLLIMPEXP_CORE wxGridColumnHeaderRenderer
-    : public wxGridHeaderCellRenderer
+    : public wxGridHeaderLabelsRenderer
 {
 };
 
 class WXDLLIMPEXP_CORE wxGridCornerHeaderRenderer
-    : public wxGridHeaderCellRenderer
+    : public wxGridHeaderLabelsRenderer
 {
 };
 
diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index 0be92a14e7..85f339aa3b 100644
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -1019,7 +1019,7 @@ protected:
 
     @since 2.9.1
  */
-class wxGridHeaderCellRenderer
+class wxGridHeaderLabelsRenderer
 {
 public:
     /**
@@ -1063,7 +1063,7 @@ public:
 /**
     Base class for row headers renderer.
 
-    This is the same as wxGridHeaderCellRenderer currently but we still use a
+    This is the same as wxGridHeaderLabelsRenderer currently but we still use a
     separate class for it to distinguish it from wxGridColumnHeaderRenderer
     and wxGridCornerHeaderRenderer.
 
@@ -1073,14 +1073,14 @@ public:
 
     @since 2.9.1
  */
-class wxGridRowHeaderRenderer : public wxGridHeaderCellRenderer
+class wxGridRowHeaderRenderer : public wxGridHeaderLabelsRenderer
 {
 };
 
 /**
     Base class for column headers renderer.
 
-    This is the same as wxGridHeaderCellRenderer currently but we still use a
+    This is the same as wxGridHeaderLabelsRenderer currently but we still use a
     separate class for it to distinguish it from wxGridRowHeaderRenderer and
     wxGridCornerHeaderRenderer.
 
@@ -1090,14 +1090,14 @@ class wxGridRowHeaderRenderer : public wxGridHeaderCellRenderer
 
     @since 2.9.1
  */
-class wxGridColumnHeaderRenderer : public wxGridHeaderCellRenderer
+class wxGridColumnHeaderRenderer : public wxGridHeaderLabelsRenderer
 {
 };
 
 /**
     Base class for corner header renderer.
 
-    This is the same as wxGridHeaderCellRenderer currently but we still use a
+    This is the same as wxGridHeaderLabelsRenderer currently but we still use a
     separate class for it to distinguish it from wxGridRowHeaderRenderer and
     wxGridColumnHeaderRenderer.
 
@@ -1107,7 +1107,7 @@ class wxGridColumnHeaderRenderer : public wxGridHeaderCellRenderer
 
     @since 2.9.1
  */
-class wxGridCornerHeaderRenderer : public wxGridHeaderCellRenderer
+class wxGridCornerHeaderRenderer : public wxGridHeaderLabelsRenderer
 {
 };
 
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 6c7713b5bc..f6993de388 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -216,10 +216,10 @@ wxGridCellWorker::~wxGridCellWorker()
 }
 
 // ----------------------------------------------------------------------------
-// wxGridHeaderCellRenderer and related classes
+// wxGridHeaderLabelsRenderer and related classes
 // ----------------------------------------------------------------------------
 
-void wxGridHeaderCellRenderer::DrawLabel(const wxGrid& grid,
+void wxGridHeaderLabelsRenderer::DrawLabel(const wxGrid& grid,
                                          wxDC& dc,
                                          const wxString& value,
                                          const wxRect& rect,