X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..83135a2c2881fbce222c42c31a60bfe815fdf1b3:/include/wx/mgl/brush.h?ds=inline diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index c419a9f5ae..afb78bafa5 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -20,32 +20,29 @@ // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +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 wxBitmap &stippleBitmap); - wxBrush(const wxBrush &brush); - ~wxBrush() {} - wxBrush& operator = (const wxBrush& brush); - bool operator == (const wxBrush& brush) const; - bool operator != (const wxBrush& brush) const; - bool Ok() const; + + bool operator==(const wxBrush& brush) const; + bool operator!=(const wxBrush& brush) const; virtual int GetStyle() const; wxColour &GetColour() const; wxBitmap *GetStipple() const; void SetColour(const wxColour& col); - void SetColour(const unsigned char r, const unsigned char g, const unsigned char b); + void SetColour(unsigned char r, unsigned char g, unsigned char b); void SetStyle(int style); void SetStipple(const wxBitmap& stipple); @@ -55,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)