X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b36366c59ea68056ba07a3ca1c2cd6022a59735..ad0ac642d5764497804bee2caad4fc1f20fc6cea:/include/wx/gtk/brush.h diff --git a/include/wx/gtk/brush.h b/include/wx/gtk/brush.h index e185621697..3a446e000c 100644 --- a/include/wx/gtk/brush.h +++ b/include/wx/gtk/brush.h @@ -11,7 +11,7 @@ #ifndef __GTKBRUSHH__ #define __GTKBRUSHH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -25,32 +25,32 @@ // classes //----------------------------------------------------------------------------- -class wxBrush; +class WXDLLIMPEXP_CORE wxBrush; //----------------------------------------------------------------------------- // wxBrush //----------------------------------------------------------------------------- -class wxBrush: public wxGDIObject +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { public: wxBrush() { } - + wxBrush( const wxColour &colour, int style = wxSOLID ); wxBrush( const wxBitmap &stippleBitmap ); ~wxBrush(); - + wxBrush( const wxBrush &brush ) - : wxGDIObject() + : wxBrushBase() { Ref(brush); } wxBrush& operator = ( const wxBrush& brush ) { Ref(brush); return *this; } - + bool Ok() const { return m_refData != NULL; } - + bool operator == ( const wxBrush& brush ) const; bool operator != (const wxBrush& brush) const { return !(*this == brush); } - int GetStyle() const; + virtual int GetStyle() const; wxColour &GetColour() const; wxBitmap *GetStipple() const; @@ -63,7 +63,7 @@ private: // ref counting code virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - + DECLARE_DYNAMIC_CLASS(wxBrush) };