X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/536b70ac680647cd72b71c21102869f750b73cab..a434b43fd4ac9db00fa6115ab40449613595f1a2:/include/wx/univ/renderer.h?ds=inline diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index f1c2f9c5b9..dc05cfa61c 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 /////////////////////////////////////////////////////////////////////////////// /* @@ -69,7 +69,16 @@ public: virtual void DrawBackground(wxDC& dc, const wxColour& col, const wxRect& rect, - int flags) = 0; + int flags, + wxWindow *window = NULL ) = 0; + + // draw the button surface + virtual void DrawButtonSurface(wxDC& dc, + const wxColour& col, + const wxRect& rect, + int flags ) + { DrawBackground( dc, col, rect, flags ); } + // draw the label inside the given rectangle with the specified alignment // and optionally emphasize the character with the given index @@ -194,7 +203,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, @@ -219,25 +229,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, @@ -396,10 +410,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) @@ -497,8 +514,9 @@ public: virtual void DrawBackground(wxDC& dc, const wxColour& col, const wxRect& rect, - int flags) - { m_renderer->DrawBackground(dc, col, rect, flags); } + int flags, + wxWindow *window = NULL ) + { m_renderer->DrawBackground(dc, col, rect, flags, window ); } virtual void DrawLabel(wxDC& dc, const wxString& label, const wxRect& rect, @@ -604,14 +622,16 @@ 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, int selStart = -1, - int selEnd = -1) - { m_renderer->DrawTextLine(dc, text, rect, selStart, selEnd); } + int selEnd = -1, + int flags = 0) + { m_renderer->DrawTextLine(dc, text, rect, selStart, selEnd, flags); } virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) { m_renderer->DrawLineWrapMark(dc, rect); } @@ -626,25 +646,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 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, @@ -709,7 +733,7 @@ public: virtual void GetComboBitmaps(wxBitmap *bmpNormal, wxBitmap *bmpFocus, wxBitmap *bmpPressed, - wxBitmap *bmpDisabled) const + wxBitmap *bmpDisabled) { m_renderer->GetComboBitmaps(bmpNormal, bmpFocus, bmpPressed, bmpDisabled); } @@ -767,11 +791,14 @@ public: virtual wxCoord GetSliderTickLen() const { return m_renderer->GetSliderTickLen(); } virtual wxRect GetSliderShaftRect(const wxRect& rect, - wxOrientation orient) const - { return 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