Extract default grid header renderers from wxGridCellAttrProvider.

[wxWidgets.git] / include / wx / renderer.h

diff --git a/include/wx/renderer.h b/include/wx/renderer.h
index 9a4bded2055b782f4e08938143874cb2183c7eea..fbe6a105af57dd4ce75b1cb5b8259ebe6613acf2 100644 (file)
--- a/include/wx/renderer.h
+++ b/include/wx/renderer.h
@@ -228,12 +228,8 @@ public:
                               const wxRect& rect,
                               int flags = 0) = 0;
 
                               const wxRect& rect,
                               int flags = 0) = 0;
 

-#if WXWIN_COMPATIBILITY_2_8

     // Returns the default size of a check box.
     // Returns the default size of a check box.

-    wxDEPRECATED_INLINE( virtual wxSize GetCheckBoxSize(wxWindow *WXUNUSED(win)),
-                         return GetCheckBoxSize(); );
-#endif
-    virtual wxSize GetCheckBoxSize() const = 0;
+    virtual wxSize GetCheckBoxSize(wxWindow *win) = 0;

 
     // draw blank button
     //
 
     // draw blank button
     //


@@ -281,11 +277,11 @@ public:
                               const wxRect& rect,
                               int flags = 0) = 0;
 
                               const wxRect& rect,
                               int flags = 0) = 0;
 

-    // Draw a native wxRadioButton (just the graphical portion)
-    virtual void DrawRadioButton(wxWindow* win,
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  int flags = 0) = 0;
+    // Draw a native wxRadioButton bitmap
+    virtual void DrawRadioBitmap(wxWindow* win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int flags = 0) = 0;

 
     // geometry functions
     // ------------------
 
     // geometry functions
     // ------------------


@@ -408,12 +404,8 @@ public:
                               int flags = 0)
         { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); }
 
                               int flags = 0)
         { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); }
 

-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_INLINE( virtual wxSize GetCheckBoxSize(wxWindow *WXUNUSED(win)),
-                         return m_rendererNative.GetCheckBoxSize(); );
-#endif
-    virtual wxSize GetCheckBoxSize() const
-        { return m_rendererNative.GetCheckBoxSize(); }
+    virtual wxSize GetCheckBoxSize(wxWindow *win)
+        { return m_rendererNative.GetCheckBoxSize(win); }

 
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,
 
     virtual void DrawPushButton(wxWindow *win,
                                 wxDC& dc,


@@ -451,11 +443,11 @@ public:
                               int flags = 0)
         { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); }
 
                               int flags = 0)
         { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); }
 

-    virtual void DrawRadioButton(wxWindow* win,
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  int flags = 0)
-        { m_rendererNative.DrawRadioButton( win, dc, rect, flags); }
+    virtual void DrawRadioBitmap(wxWindow* win,
+                                 wxDC& dc,
+                                 const wxRect& rect,
+                                 int flags = 0)
+        { m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); }

 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win)
         { return m_rendererNative.GetSplitterParams(win); }
 
     virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win)
         { return m_rendererNative.GetSplitterParams(win); }