X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b09cac450645c3b93baff6d50c412c9612869fe5..c5c1ea964817e562d1c4b0d89b3937fce28c3f10:/include/wx/brush.h?ds=inline diff --git a/include/wx/brush.h b/include/wx/brush.h index 08fc16b5ff..9eb0a4c7e1 100644 --- a/include/wx/brush.h +++ b/include/wx/brush.h @@ -34,25 +34,27 @@ enum wxBrushStyle wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHORIZONTAL_HATCH, wxBRUSHSTYLE_VERTICAL_HATCH = wxVERTICAL_HATCH, wxBRUSHSTYLE_FIRST_HATCH = wxFIRST_HATCH, - wxBRUSHSTYLE_LAST_HATCH = wxLAST_HATCH, + wxBRUSHSTYLE_LAST_HATCH = wxLAST_HATCH }; // wxBrushBase -class WXDLLEXPORT wxBrushBase: public wxGDIObject +class WXDLLIMPEXP_CORE wxBrushBase: public wxGDIObject { public: virtual ~wxBrushBase() { } + virtual void SetColour(const wxColour& col) = 0; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) = 0; + virtual void SetStyle(wxBrushStyle style) = 0; + virtual void SetStipple(const wxBitmap& stipple) = 0; + + virtual wxColour GetColour() const = 0; virtual wxBrushStyle GetStyle() const = 0; + virtual wxBitmap *GetStipple() const = 0; virtual bool IsHatch() const { return (GetStyle()>=wxBRUSHSTYLE_FIRST_HATCH) && (GetStyle()<=wxBRUSHSTYLE_LAST_HATCH); } - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( void SetStyle(int style) ) - { SetStyle((wxBrushStyle)style); } -#endif }; #if defined(__WXPALMOS__) @@ -70,7 +72,7 @@ public: #elif defined(__WXDFB__) #include "wx/dfb/brush.h" #elif defined(__WXMAC__) - #include "wx/mac/brush.h" + #include "wx/osx/brush.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/brush.h" #elif defined(__WXPM__) @@ -94,7 +96,26 @@ public: #endif }; -extern WXDLLEXPORT_DATA(wxBrushList*) wxTheBrushList; +extern WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; -#endif - // _WX_BRUSH_H_BASE_ +// provide comparison operators to allow code such as +// +// if ( brush.GetStyle() == wxTRANSPARENT ) +// +// to compile without warnings which it would otherwise provoke from some +// compilers as it compares elements of different enums +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + +inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t) +{ + return static_cast(s) == static_cast(t); +} + +inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t) +{ + return !(s == t); +} + +#endif // FUTURE_WXWIN_COMPATIBILITY_3_0 + +#endif // _WX_BRUSH_H_BASE_