X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..3e6858cdcb9278b36446466c346d984e7e306553:/include/wx/mgl/brush.h diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index 97fccfdd1a..318018f8cb 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -27,25 +27,23 @@ class WXDLLIMPEXP_FWD_CORE wxBrush; // wxBrush //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush: public wxBrushBase +class WXDLLEXPORT wxBrush : public wxBrushBase { public: wxBrush() {} - wxBrush(const wxColour &colour, int style = wxSOLID); + wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID); wxBrush(const wxBitmap &stippleBitmap); - virtual ~wxBrush() {} - bool operator == (const wxBrush& brush) const; - bool operator != (const wxBrush& brush) const; - bool Ok() const { return IsOk(); } - bool IsOk() const; - virtual int GetStyle() const; + bool operator==(const wxBrush& brush) const; + bool operator!=(const wxBrush& brush) const; + + virtual wxBrushStyle GetStyle() const; wxColour &GetColour() const; wxBitmap *GetStipple() const; void SetColour(const wxColour& col); void SetColour(unsigned char r, unsigned char g, unsigned char b); - void SetStyle(int style); + void SetStyle(wxBrushStyle style); void SetStipple(const wxBitmap& stipple); // implementation: @@ -54,9 +52,8 @@ public: void* GetPixPattern() const; protected: - // ref counting code - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; private: DECLARE_DYNAMIC_CLASS(wxBrush)