X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b36366c59ea68056ba07a3ca1c2cd6022a59735..6ca154fcc14a2532798a23977baee2eed3179d19:/include/wx/mgl/brush.h diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index f1c3b76eff..7f7ab1a239 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -11,7 +11,7 @@ #ifndef __WX_BRUSH_H__ #define __WX_BRUSH_H__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "brush.h" #endif @@ -32,7 +32,7 @@ class WXDLLEXPORT wxBrush; // wxBrush //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { public: wxBrush() {} @@ -45,7 +45,7 @@ public: bool operator != (const wxBrush& brush) const; bool Ok() const; - int GetStyle() const; + virtual int GetStyle() const; wxColour &GetColour() const; wxBitmap *GetStipple() const; @@ -53,7 +53,7 @@ public: void SetColour(unsigned char r, unsigned char g, unsigned char b); void SetStyle(int style); void SetStipple(const wxBitmap& stipple); - + // implementation: void* GetMaskPattern() const;