X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..bf7d7ee7062f7f6028df40e43745235658e38b4d:/include/wx/univ/renderer.h?ds=inline diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index 5e4325c21f..3304d277ea 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -32,6 +32,7 @@ class WXDLLEXPORT wxDC; class WXDLLEXPORT wxCheckListBox; class WXDLLEXPORT wxListBox; class WXDLLEXPORT wxMenu; +class WXDLLEXPORT wxMenuGeometryInfo; class WXDLLEXPORT wxScrollBar; class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxWindow; @@ -43,10 +44,6 @@ class WXDLLEXPORT wxGauge; #include "wx/gdicmn.h" #include "wx/scrolbar.h" // for wxScrollBar::Element -#ifndef WX_PRECOMP - #include "wx/menu.h" // for wxMenuGeometryInfo -#endif // WX_PRECOMP - // ---------------------------------------------------------------------------- // wxRenderer: abstract renderers interface // ---------------------------------------------------------------------------- @@ -223,6 +220,7 @@ public: int step = 1, int flags = 0) = 0; +#if wxUSE_MENUS // draw a menu bar item virtual void DrawMenuBarItem(wxDC& dc, const wxRect& rect, @@ -246,7 +244,7 @@ public: virtual void DrawMenuSeparator(wxDC& dc, wxCoord y, const wxMenuGeometryInfo& geomInfo) = 0; - +#endif // misc functions // -------------- @@ -337,6 +335,7 @@ 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; @@ -347,7 +346,7 @@ public: // the returned pointer must be deleted by the caller virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win, const wxMenu& menu) const = 0; - +#endif // virtual dtor for any base class virtual ~wxRenderer(); @@ -549,6 +548,7 @@ 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, @@ -570,7 +570,7 @@ public: wxCoord y, const wxMenuGeometryInfo& geomInfo) { m_renderer->DrawMenuSeparator(dc, y, geomInfo); } - +#endif virtual void GetComboBitmaps(wxBitmap *bmpNormal, wxBitmap *bmpPressed, wxBitmap *bmpDisabled) @@ -631,12 +631,13 @@ 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 protected: wxRenderer *m_renderer; };