X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b36366c59ea68056ba07a3ca1c2cd6022a59735..8397cab4dafee82a887785a80ab8f588a68d9f27:/include/wx/msw/brush.h diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index c51b948fed..782bc57f2d 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -12,7 +12,7 @@ #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "brush.h" #endif @@ -26,13 +26,13 @@ class WXDLLEXPORT wxBrush; // wxBrush // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush : public wxGDIObject +class WXDLLEXPORT wxBrush : public wxBrushBase { public: wxBrush(); wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - wxBrush(const wxBrush& brush) { Ref(brush); } + wxBrush(const wxBrush& brush) : wxBrushBase(brush) { Ref(brush); } virtual ~wxBrush(); virtual void SetColour(const wxColour& col); @@ -45,7 +45,7 @@ public: bool operator!=(const wxBrush& brush) const { return !(*this == brush); } wxColour GetColour() const; - int GetStyle() const; + virtual int GetStyle() const; wxBitmap *GetStipple() const; bool Ok() const { return m_refData != NULL; }