X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9979fbba4ecb2d4a1dadce7cfb0e9c69c793fe9f..1b8865e92caa043cf31043e38a788d8d4a9286e0:/include/wx/univ/renderer.h?ds=sidebyside diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index c0f8e947fd..d45e65ae0e 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,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 - 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__ @@ -28,6 +32,8 @@ #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 @@ -203,7 +209,8 @@ public: const wxString& label, const wxBitmap& bitmap, const wxRect& rect, - int flags = 0) = 0; + int flags = 0, + long style = 0) = 0; // draw a (part of) line in the text control virtual void DrawTextLine(wxDC& dc, @@ -228,25 +235,29 @@ public: // draw the slider shaft virtual void DrawSliderShaft(wxDC& dc, const wxRect& rect, + int lenThumb, wxOrientation orient, int flags = 0, + long style = 0, wxRect *rectShaft = NULL) = 0; // draw the slider thumb virtual void DrawSliderThumb(wxDC& dc, const wxRect& rect, wxOrientation orient, - int flags = 0) = 0; + int flags = 0, + long style = 0) = 0; // draw the slider ticks virtual void DrawSliderTicks(wxDC& dc, const wxRect& rect, - const wxSize& sizeThumb, + int lenThumb, wxOrientation orient, int start, int end, int step = 1, - int flags = 0) = 0; + int flags = 0, + long style = 0) = 0; // draw a menu bar item virtual void DrawMenuBarItem(wxDC& dc, @@ -405,10 +416,13 @@ public: // get the slider shaft rect from the total slider rect virtual wxRect GetSliderShaftRect(const wxRect& rect, - wxOrientation orient) const = 0; + int lenThumb, + wxOrientation orient, + long style = 0) const = 0; // get the size of the slider thumb for the given total slider rect virtual wxSize GetSliderThumbSize(const wxRect& rect, + int lenThumb, wxOrientation orient) const = 0; // get the size of one progress bar step (in horz and vertical directions) @@ -450,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() @@ -614,8 +629,9 @@ public: const wxString& label, const wxBitmap& bitmap, const wxRect& rect, - int flags = 0) - { m_renderer->DrawToolBarButton(dc, label, bitmap, rect, flags); } + int flags = 0, + long style = 0) + { m_renderer->DrawToolBarButton(dc, label, bitmap, rect, flags, style); } virtual void DrawTextLine(wxDC& dc, const wxString& text, const wxRect& rect, @@ -637,25 +653,29 @@ public: virtual void DrawSliderShaft(wxDC& dc, const wxRect& rect, + int lenThumb, wxOrientation orient, int flags = 0, + long style = 0, wxRect *rectShaft = NULL) - { m_renderer->DrawSliderShaft(dc, rect, orient, flags, rectShaft); } + { m_renderer->DrawSliderShaft(dc, rect, lenThumb, orient, flags, style, rectShaft); } virtual void DrawSliderThumb(wxDC& dc, const wxRect& rect, wxOrientation orient, - int flags = 0) - { m_renderer->DrawSliderThumb(dc, rect, orient, flags); } + int flags = 0, + long style = 0) + { m_renderer->DrawSliderThumb(dc, rect, orient, flags, style); } virtual void DrawSliderTicks(wxDC& dc, const wxRect& rect, - const wxSize& sizeThumb, + int lenThumb, wxOrientation orient, int start, int end, - int step = 1, - int flags = 0) - { m_renderer->DrawSliderTicks(dc, rect, sizeThumb, orient, - start, end, start, flags); } + int WXUNUSED(step) = 1, + int flags = 0, + long style = 0) + { m_renderer->DrawSliderTicks(dc, rect, lenThumb, orient, + start, end, start, flags, style); } virtual void DrawMenuBarItem(wxDC& dc, const wxRect& rect, @@ -778,11 +798,14 @@ public: virtual wxCoord GetSliderTickLen() const { return m_renderer->GetSliderTickLen(); } virtual wxRect GetSliderShaftRect(const wxRect& rect, - wxOrientation orient) const - { return m_renderer->GetSliderShaftRect(rect, orient); } + int lenThumb, + wxOrientation orient, + long style = 0) const + { return m_renderer->GetSliderShaftRect(rect, lenThumb, orient, style); } virtual wxSize GetSliderThumbSize(const wxRect& rect, + int lenThumb, wxOrientation orient) const - { return m_renderer->GetSliderThumbSize(rect, orient); } + { return m_renderer->GetSliderThumbSize(rect, lenThumb, orient); } virtual wxSize GetProgressBarStep() const { return m_renderer->GetProgressBarStep(); } virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const @@ -805,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; };