X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk1/brush.h?ds=sidebyside diff --git a/include/wx/gtk1/brush.h b/include/wx/gtk1/brush.h index 31d4b7292c..e4ede7f560 100644 --- a/include/wx/gtk1/brush.h +++ b/include/wx/gtk1/brush.h @@ -1,8 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/gtk1/brush.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -11,10 +10,6 @@ #ifndef __GTKBRUSHH__ #define __GTKBRUSHH__ -#ifdef __GNUG__ -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -25,37 +20,45 @@ // classes //----------------------------------------------------------------------------- -class wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBrush; //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxGDIObject +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: - wxBrush(); - wxBrush( const wxColour &colour, int style ); + wxBrush() { } + + wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif 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; - - int GetStyle() const; - wxColour &GetColour() const; + virtual ~wxBrush(); + + bool operator==(const wxBrush& brush) const; + bool operator!=(const wxBrush& brush) const { return !(*this == brush); } + + 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 ); - void Unshare(); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif private: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + DECLARE_DYNAMIC_CLASS(wxBrush) };