don't draw buttons unless we have wxTR_HAS_BUTTONS style

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

diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h
index dc05cfa61ce83ee27b41a95fc873f39eac600017..d45e65ae0ebb4aadf8b2ab597b50c019898a0e34 100644 (file)
--- a/include/wx/univ/renderer.h
+++ b/include/wx/univ/renderer.h
@@ -18,7 +18,11 @@
    renderers and provide the functionality which is often similar or identical
    in all renderers (using inheritance here would be more restrictive as the
    given concrete renderer may need an arbitrary subset of the base class
    renderers and provide the functionality which is often similar or identical
    in all renderers (using inheritance here would be more restrictive as the
    given concrete renderer may need an arbitrary subset of the base class

-   methods)
+   methods).
+
+   Finally note that wxRenderer supersedes wxRendererNative in wxUniv build and
+   includes the latters functionality (which it may delegate to the generic
+   implementation of the latter or reimplement itself).

  */
 
 #ifdef __GNUG__
  */
 
 #ifdef __GNUG__


@@ -28,6 +32,8 @@
 #ifndef _WX_UNIV_RENDERER_H_
 #define _WX_UNIV_RENDERER_H_
 
 #ifndef _WX_UNIV_RENDERER_H_
 #define _WX_UNIV_RENDERER_H_
 

+#include "wx/renderer.h"
+

 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxCheckListBox;
 class WXDLLEXPORT wxListBox;
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxCheckListBox;
 class WXDLLEXPORT wxListBox;


@@ -59,7 +65,7 @@ public:
 // wxRenderer: abstract renderers interface
 // ----------------------------------------------------------------------------
 
 // wxRenderer: abstract renderers interface
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxRenderer
+class WXDLLEXPORT wxRenderer : public wxDelegateRendererNative

 {
 public:
     // drawing functions
 {
 public:
     // drawing functions


@@ -458,6 +464,7 @@ public:
     // virtual dtor for any base class
     virtual ~wxRenderer();
 
     // virtual dtor for any base class
     virtual ~wxRenderer();
 

+

 protected:
     // draw a frame around rectFrame rectangle but not touching the rectLabel
     // one: this is used by DrawFrame()
 protected:
     // draw a frame around rectFrame rectangle but not touching the rectLabel
     // one: this is used by DrawFrame()


@@ -664,7 +671,7 @@ public:
                                  wxOrientation orient,
                                  int start,
                                  int end,
                                  wxOrientation orient,
                                  int start,
                                  int end,

-                                 int step = 1,
+                                 int WXUNUSED(step) = 1,

                                  int flags = 0,
                                  long style = 0)
         { m_renderer->DrawSliderTicks(dc, rect, lenThumb, orient,
                                  int flags = 0,
                                  long style = 0)
         { m_renderer->DrawSliderTicks(dc, rect, lenThumb, orient,


@@ -821,6 +828,17 @@ public:
                              int flags) const
         { return m_renderer->HitTestFrame(rect, pt, flags); }
 
                              int flags) const
         { return m_renderer->HitTestFrame(rect, pt, flags); }
 

+    virtual void DrawHeaderButton(wxWindow *win,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int flags = 0)
+        { m_renderer->DrawHeaderButton(win, dc, rect, flags); }
+    virtual void DrawTreeItemButton(wxWindow *win,
+                                    wxDC& dc,
+                                    const wxRect& rect,
+                                    int flags = 0)
+        { m_renderer->DrawTreeItemButton(win, dc, rect, flags); }
+

 protected:
     wxRenderer *m_renderer;
 };
 protected:
     wxRenderer *m_renderer;
 };