X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/813edf09b3457f4b3298c8353cb623cb7e49bc89..b5b49e42939fd7ef098241733648b534f71b526c:/include/wx/univ/renderer.h?ds=sidebyside diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index cfcdccf9c8..3aead22044 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -42,8 +42,19 @@ class WXDLLEXPORT wxGauge; #include "wx/string.h" #include "wx/gdicmn.h" +#include "wx/icon.h" #include "wx/scrolbar.h" // for wxScrollBar::Element +// helper class used by wxMenu-related functions +class WXDLLEXPORT wxMenuGeometryInfo +{ +public: + // get the total size of the menu + virtual wxSize GetSize() const = 0; + + virtual ~wxMenuGeometryInfo(); +}; + // ---------------------------------------------------------------------------- // wxRenderer: abstract renderers interface // ---------------------------------------------------------------------------- @@ -58,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 @@ -177,6 +197,14 @@ public: wxAlignment align = wxALIGN_LEFT, int indexAccel = -1) = 0; + // draw a toolbar button (label may be empty, bitmap may be invalid, if + // both conditions are true this function draws a separator) + virtual void DrawToolBarButton(wxDC& dc, + const wxString& label, + const wxBitmap& bitmap, + const wxRect& rect, + int flags = 0) = 0; + // draw a (part of) line in the text control virtual void DrawTextLine(wxDC& dc, const wxString& text, @@ -220,7 +248,6 @@ public: int step = 1, int flags = 0) = 0; -#if wxUSE_MENUS // draw a menu bar item virtual void DrawMenuBarItem(wxDC& dc, const wxRect& rect, @@ -244,7 +271,14 @@ public: virtual void DrawMenuSeparator(wxDC& dc, wxCoord y, const wxMenuGeometryInfo& geomInfo) = 0; -#endif + + // draw a status bar field: wxCONTROL_ISDEFAULT bit in the flags is + // interpreted specially and means "draw the status bar grip" here + virtual void DrawStatusField(wxDC& dc, + const wxRect& rect, + const wxString& label, + int flags = 0) = 0; + // draw complete frame/dialog titlebar virtual void DrawFrameTitleBar(wxDC& dc, const wxRect& rect, @@ -253,7 +287,7 @@ public: int flags, int specialButton = 0, int specialButtonFlags = 0) = 0; - + // draw frame borders virtual void DrawFrameBorder(wxDC& dc, const wxRect& rect, @@ -339,15 +373,22 @@ public: virtual wxSize GetRadioBitmapSize() const = 0; virtual wxCoord GetCheckItemMargin() const = 0; + // get the standard size of a toolbar button and also return the size of + // a toolbar separator in the provided pointer + virtual wxSize GetToolBarButtonSize(wxCoord *separator) const = 0; + + // get the margins between/around the toolbar buttons + virtual wxSize GetToolBarMargin() const = 0; + // convert between text rectangle and client rectangle for text controls: // the former is typicall smaller to leave margins around text virtual wxRect GetTextTotalArea(const wxTextCtrl *text, - const wxRect& rectText) = 0; + const wxRect& rectText) const = 0; // extra space is for line indicators virtual wxRect GetTextClientArea(const wxTextCtrl *text, const wxRect& rectTotal, - wxCoord *extraSpaceBeyond) = 0; + wxCoord *extraSpaceBeyond) const = 0; // get the overhang of a selected tab virtual wxSize GetTabIndent() const = 0; @@ -373,7 +414,6 @@ public: // get the size of one progress bar step (in horz and vertical directions) virtual wxSize GetProgressBarStep() const = 0; -#if wxUSE_MENUS // get the size of rectangle to use in the menubar for the given text rect virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const = 0; @@ -384,19 +424,28 @@ public: // the returned pointer must be deleted by the caller virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win, const wxMenu& menu) const = 0; -#endif + + // get the borders around the status bar fields (x and y fields of the + // return value) and also, optionally, the border between the fields + virtual wxSize GetStatusBarBorders(wxCoord *borderBetweenFields) const = 0; // get client area rectangle of top level window (i.e. subtract // decorations from given rectangle) virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const = 0; + // get size of whole top level window, given size of its client area size virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const = 0; + + // get the minimal size of top level window + virtual wxSize GetFrameMinSize(int flags) const = 0; + // get titlebar icon size virtual wxSize GetFrameIconSize() const = 0; + // returns one of wxHT_TOPLEVEL_XXX constants virtual int HitTestFrame(const wxRect& rect, const wxPoint& pt, - int flags) const = 0; + int flags = 0) const = 0; // virtual dtor for any base class virtual ~wxRenderer(); @@ -457,8 +506,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, @@ -560,6 +610,12 @@ public: int indexAccel = -1) { m_renderer->DrawRadioButton(dc, label, bitmap, rect, flags, align, indexAccel); } + virtual void DrawToolBarButton(wxDC& dc, + const wxString& label, + const wxBitmap& bitmap, + const wxRect& rect, + int flags = 0) + { m_renderer->DrawToolBarButton(dc, label, bitmap, rect, flags); } virtual void DrawTextLine(wxDC& dc, const wxString& text, const wxRect& rect, @@ -599,7 +655,6 @@ public: int flags = 0) { m_renderer->DrawSliderTicks(dc, rect, sizeThumb, orient, start, end, start, flags); } -#if wxUSE_MENUS virtual void DrawMenuBarItem(wxDC& dc, const wxRect& rect, @@ -621,7 +676,13 @@ public: wxCoord y, const wxMenuGeometryInfo& geomInfo) { m_renderer->DrawMenuSeparator(dc, y, geomInfo); } -#endif + + virtual void DrawStatusField(wxDC& dc, + const wxRect& rect, + const wxString& label, + int flags = 0) + { m_renderer->DrawStatusField(dc, rect, label, flags); } + virtual void DrawFrameTitleBar(wxDC& dc, const wxRect& rect, const wxString& title, @@ -629,7 +690,7 @@ public: int flags, int specialButton = 0, int specialButtonFlag = 0) - { m_renderer->DrawFrameTitleBar(dc, rect, title, icon, flags, + { m_renderer->DrawFrameTitleBar(dc, rect, title, icon, flags, specialButton, specialButtonFlag); } virtual void DrawFrameBorder(wxDC& dc, const wxRect& rect, @@ -695,11 +756,17 @@ public: virtual wxCoord GetCheckItemMargin() const { return m_renderer->GetCheckItemMargin(); } - virtual wxRect GetTextTotalArea(const wxTextCtrl *text, const wxRect& rect) + virtual wxSize GetToolBarButtonSize(wxCoord *separator) const + { return m_renderer->GetToolBarButtonSize(separator); } + virtual wxSize GetToolBarMargin() const + { return m_renderer->GetToolBarMargin(); } + + virtual wxRect GetTextTotalArea(const wxTextCtrl *text, + const wxRect& rect) const { return m_renderer->GetTextTotalArea(text, rect); } virtual wxRect GetTextClientArea(const wxTextCtrl *text, const wxRect& rect, - wxCoord *extraSpaceBeyond) + wxCoord *extraSpaceBeyond) const { return m_renderer->GetTextClientArea(text, rect, extraSpaceBeyond); } virtual wxSize GetTabIndent() const { return m_renderer->GetTabIndent(); } @@ -717,17 +784,19 @@ public: { return m_renderer->GetSliderThumbSize(rect, orient); } virtual wxSize GetProgressBarStep() const { return m_renderer->GetProgressBarStep(); } -#if wxUSE_MENUS virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const { return m_renderer->GetMenuBarItemSize(sizeText); } virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win, const wxMenu& menu) const { return m_renderer->GetMenuGeometry(win, menu); } -#endif + virtual wxSize GetStatusBarBorders(wxCoord *borderBetweenFields) const + { return m_renderer->GetStatusBarBorders(borderBetweenFields); } virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const { return m_renderer->GetFrameClientArea(rect, flags); } virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const { return m_renderer->GetFrameTotalSize(clientSize, flags); } + virtual wxSize GetFrameMinSize(int flags) const + { return m_renderer->GetFrameMinSize(flags); } virtual wxSize GetFrameIconSize() const { return m_renderer->GetFrameIconSize(); } virtual int HitTestFrame(const wxRect& rect,