X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..3cb3b8b84de3ff3b660108724139c24b39746449:/include/wx/univ/renderer.h diff --git a/include/wx/univ/renderer.h b/include/wx/univ/renderer.h index 462d638b22..2dc137a9b9 100644 --- a/include/wx/univ/renderer.h +++ b/include/wx/univ/renderer.h @@ -9,6 +9,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifndef _WX_UNIV_RENDERER_H_ +#define _WX_UNIV_RENDERER_H_ + /* wxRenderer class is used to draw all wxWidgets controls. This is an ABC and the look of the application is determined by the concrete derivation of @@ -25,13 +28,6 @@ implementation of the latter or reimplement itself). */ -#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; @@ -84,7 +80,7 @@ public: 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 @@ -115,7 +111,7 @@ public: wxRect *rectIn = (wxRect *)NULL) = 0; // draw text control border (I hate to have a separate method for this but - // it is needed to accomodate GTK+) + // it is needed to accommodate GTK+) virtual void DrawTextBorder(wxDC& dc, wxBorder border, const wxRect& rect, @@ -288,7 +284,7 @@ public: virtual void DrawStatusField(wxDC& dc, const wxRect& rect, const wxString& label, - int flags = 0) = 0; + int flags = 0, int style = 0) = 0; // draw complete frame/dialog titlebar virtual void DrawFrameTitleBar(wxDC& dc, @@ -701,8 +697,8 @@ public: virtual void DrawStatusField(wxDC& dc, const wxRect& rect, const wxString& label, - int flags = 0) - { m_renderer->DrawStatusField(dc, rect, label, flags); } + int flags = 0, int style = 0) + { m_renderer->DrawStatusField(dc, rect, label, flags, style); } virtual void DrawFrameTitleBar(wxDC& dc, const wxRect& rect, @@ -897,7 +893,7 @@ private: // common part of DrawItems() and DrawCheckItems() void DoDrawItems(const wxListBox *listbox, size_t itemFirst, size_t itemLast, - bool isCheckLbox = FALSE); + bool isCheckLbox = false); wxWindow *m_window; wxRenderer *m_renderer;