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.
This commit is contained in:
@@ -326,10 +326,10 @@ protected:
|
|||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
// Base class for header cells renderers.
|
// Base class for header cells renderers.
|
||||||
class WXDLLIMPEXP_CORE wxGridHeaderCellRenderer
|
class WXDLLIMPEXP_CORE wxGridHeaderLabelsRenderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual ~wxGridHeaderCellRenderer() {}
|
virtual ~wxGridHeaderLabelsRenderer() {}
|
||||||
|
|
||||||
// Draw the border around cell window.
|
// Draw the border around cell window.
|
||||||
virtual void DrawBorder(const wxGrid& grid,
|
virtual void DrawBorder(const wxGrid& grid,
|
||||||
@@ -347,21 +347,21 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Currently the row/column/corner renders don't need any methods other than
|
// 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
|
// 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)
|
// avoid inadvertently using a column header renderer for the row headers)
|
||||||
class WXDLLIMPEXP_CORE wxGridRowHeaderRenderer
|
class WXDLLIMPEXP_CORE wxGridRowHeaderRenderer
|
||||||
: public wxGridHeaderCellRenderer
|
: public wxGridHeaderLabelsRenderer
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
class WXDLLIMPEXP_CORE wxGridColumnHeaderRenderer
|
class WXDLLIMPEXP_CORE wxGridColumnHeaderRenderer
|
||||||
: public wxGridHeaderCellRenderer
|
: public wxGridHeaderLabelsRenderer
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
class WXDLLIMPEXP_CORE wxGridCornerHeaderRenderer
|
class WXDLLIMPEXP_CORE wxGridCornerHeaderRenderer
|
||||||
: public wxGridHeaderCellRenderer
|
: public wxGridHeaderLabelsRenderer
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -1019,7 +1019,7 @@ protected:
|
|||||||
|
|
||||||
@since 2.9.1
|
@since 2.9.1
|
||||||
*/
|
*/
|
||||||
class wxGridHeaderCellRenderer
|
class wxGridHeaderLabelsRenderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
/**
|
/**
|
||||||
@@ -1063,7 +1063,7 @@ public:
|
|||||||
/**
|
/**
|
||||||
Base class for row headers renderer.
|
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
|
separate class for it to distinguish it from wxGridColumnHeaderRenderer
|
||||||
and wxGridCornerHeaderRenderer.
|
and wxGridCornerHeaderRenderer.
|
||||||
|
|
||||||
@@ -1073,14 +1073,14 @@ public:
|
|||||||
|
|
||||||
@since 2.9.1
|
@since 2.9.1
|
||||||
*/
|
*/
|
||||||
class wxGridRowHeaderRenderer : public wxGridHeaderCellRenderer
|
class wxGridRowHeaderRenderer : public wxGridHeaderLabelsRenderer
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Base class for column headers renderer.
|
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
|
separate class for it to distinguish it from wxGridRowHeaderRenderer and
|
||||||
wxGridCornerHeaderRenderer.
|
wxGridCornerHeaderRenderer.
|
||||||
|
|
||||||
@@ -1090,14 +1090,14 @@ class wxGridRowHeaderRenderer : public wxGridHeaderCellRenderer
|
|||||||
|
|
||||||
@since 2.9.1
|
@since 2.9.1
|
||||||
*/
|
*/
|
||||||
class wxGridColumnHeaderRenderer : public wxGridHeaderCellRenderer
|
class wxGridColumnHeaderRenderer : public wxGridHeaderLabelsRenderer
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Base class for corner header renderer.
|
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
|
separate class for it to distinguish it from wxGridRowHeaderRenderer and
|
||||||
wxGridColumnHeaderRenderer.
|
wxGridColumnHeaderRenderer.
|
||||||
|
|
||||||
@@ -1107,7 +1107,7 @@ class wxGridColumnHeaderRenderer : public wxGridHeaderCellRenderer
|
|||||||
|
|
||||||
@since 2.9.1
|
@since 2.9.1
|
||||||
*/
|
*/
|
||||||
class wxGridCornerHeaderRenderer : public wxGridHeaderCellRenderer
|
class wxGridCornerHeaderRenderer : public wxGridHeaderLabelsRenderer
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -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,
|
wxDC& dc,
|
||||||
const wxString& value,
|
const wxString& value,
|
||||||
const wxRect& rect,
|
const wxRect& rect,
|
||||||
|
Reference in New Issue
Block a user