X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907a7e2c0fb61ecca0b6434dd69ee42b7ee1db6..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/brush.h diff --git a/include/wx/brush.h b/include/wx/brush.h index 12fdaf2fac..47b34619eb 100644 --- a/include/wx/brush.h +++ b/include/wx/brush.h @@ -27,37 +27,50 @@ enum wxBrushStyle wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE = wxSTIPPLE_MASK_OPAQUE, wxBRUSHSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK, wxBRUSHSTYLE_STIPPLE = wxSTIPPLE, - wxBRUSHSTYLE_BDIAGONAL_HATCH = wxBDIAGONAL_HATCH, - wxBRUSHSTYLE_CROSSDIAG_HATCH = wxCROSSDIAG_HATCH, - wxBRUSHSTYLE_FDIAGONAL_HATCH = wxFDIAGONAL_HATCH, - wxBRUSHSTYLE_CROSS_HATCH = wxCROSS_HATCH, - wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHORIZONTAL_HATCH, - wxBRUSHSTYLE_VERTICAL_HATCH = wxVERTICAL_HATCH, - wxBRUSHSTYLE_FIRST_HATCH = wxFIRST_HATCH, - wxBRUSHSTYLE_LAST_HATCH = wxLAST_HATCH, + wxBRUSHSTYLE_BDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL, + wxBRUSHSTYLE_CROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG, + wxBRUSHSTYLE_FDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL, + wxBRUSHSTYLE_CROSS_HATCH = wxHATCHSTYLE_CROSS, + wxBRUSHSTYLE_HORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL, + wxBRUSHSTYLE_VERTICAL_HATCH = wxHATCHSTYLE_VERTICAL, + wxBRUSHSTYLE_FIRST_HATCH = wxHATCHSTYLE_FIRST, + wxBRUSHSTYLE_LAST_HATCH = wxHATCHSTYLE_LAST }; // 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 + // Convenient helpers for testing whether the brush is a transparent one: + // unlike GetStyle() == wxBRUSHSTYLE_TRANSPARENT, they work correctly even + // if the brush is invalid (they both return false in this case). + bool IsTransparent() const + { + return IsOk() && GetStyle() == wxBRUSHSTYLE_TRANSPARENT; + } + + bool IsNonTransparent() const + { + return IsOk() && GetStyle() != wxBRUSHSTYLE_TRANSPARENT; + } }; -#if defined(__WXPALMOS__) - #include "wx/palmos/brush.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/brush.h" #elif defined(__WXMOTIF__) || defined(__WXX11__) #include "wx/x11/brush.h" @@ -65,12 +78,10 @@ public: #include "wx/gtk/brush.h" #elif defined(__WXGTK__) #include "wx/gtk1/brush.h" -#elif defined(__WXMGL__) - #include "wx/mgl/brush.h" #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 +105,7 @@ public: #endif }; -extern WXDLLEXPORT_DATA(wxBrushList*) wxTheBrushList; +extern WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; // provide comparison operators to allow code such as // @@ -104,9 +115,14 @@ extern WXDLLEXPORT_DATA(wxBrushList*) wxTheBrushList; // compilers as it compares elements of different enums #if FUTURE_WXWIN_COMPATIBILITY_3_0 +// Unfortunately some compilers have ambiguity issues when enum comparisons are +// overloaded so we have to disable the overloads in this case, see +// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details. +#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM + inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t) { - return wx_static_cast(int, s) == wx_static_cast(int, t); + return static_cast(s) == static_cast(t); } inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t) @@ -114,6 +130,8 @@ inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t) return !(s == t); } +#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM + #endif // FUTURE_WXWIN_COMPATIBILITY_3_0 #endif // _WX_BRUSH_H_BASE_