X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8f4cabe1ea3d5390f1353c0bf5649fa1476e08b..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/univ/renderer.h

diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h
index 93760cbaf7..390338dafd 100644
--- a/include/wx/univ/renderer.h
+++ b/include/wx/univ/renderer.h
@@ -6,7 +6,7 @@
 // Created:     06.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 /*
@@ -18,16 +18,22 @@
    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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "renderer.h"
 #endif
 
 #ifndef _WX_UNIV_RENDERER_H_
 #define _WX_UNIV_RENDERER_H_
 
+#include "wx/renderer.h"
+
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxCheckListBox;
 class WXDLLEXPORT wxListBox;
@@ -59,7 +65,7 @@ public:
 // wxRenderer: abstract renderers interface
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRenderer
+class WXDLLEXPORT wxRenderer : public wxDelegateRendererNative
 {
 public:
     // drawing functions
@@ -458,6 +464,7 @@ public:
     // 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()
@@ -664,7 +671,7 @@ public:
                                  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,
@@ -821,6 +828,17 @@ public:
                              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;
 };