don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/renderer.h b/include/wx/renderer.h
index 9a4bded2055b782f4e08938143874cb2183c7eea..16bd75f9bf1ff16701f5369cc3134aa6447711b0 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
     //


@@ -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,