X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..ca6911c361b04290fe1f0e64b616249b3b3d71ba:/include/wx/msw/brush.h diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index 11089cc0fc..d4ddc8d813 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -6,60 +6,57 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "brush.h" -#endif - -#include "wx/gdicmn.h" -#include "wx/gdiobj.h" -#include "wx/bitmap.h" - -class WXDLLEXPORT wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBrush; +class WXDLLIMPEXP_FWD_CORE wxColour; +class WXDLLIMPEXP_FWD_CORE wxBitmap; // ---------------------------------------------------------------------------- // wxBrush // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush : public wxGDIObject +class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase { public: wxBrush(); - wxBrush(const wxColour& col, int style = wxSOLID); + wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush(const wxBitmap& stipple); - wxBrush(const wxBrush& brush) { Ref(brush); } virtual ~wxBrush(); virtual void SetColour(const wxColour& col); virtual void SetColour(unsigned char r, unsigned char g, unsigned char b); - virtual void SetStyle(int style); + virtual void SetStyle(wxBrushStyle style); virtual void SetStipple(const wxBitmap& stipple); - wxBrush& operator=(const wxBrush& brush); bool operator==(const wxBrush& brush) const; bool operator!=(const wxBrush& brush) const { return !(*this == brush); } wxColour GetColour() const; - int GetStyle() const; + wxBrushStyle GetStyle() const; wxBitmap *GetStipple() const; - bool Ok() const { return m_refData != NULL; } +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif // return the HBRUSH for this brush virtual WXHANDLE GetResourceHandle() const; protected: - 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) }; -#endif - // _WX_BRUSH_H_ +#endif // _WX_BRUSH_H_