X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d7ee9e860187240a5f82ec4489c831f894065f2..03de0ad43959765b6b86566999469090a25b0bd0:/include/wx/mgl/brush.h diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index 325828bf16..7f7ab1a239 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -3,7 +3,7 @@ // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -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,11 +32,11 @@ class WXDLLEXPORT wxBrush; // wxBrush //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { public: wxBrush() {} - wxBrush(const wxColour &colour, int style); + wxBrush(const wxColour &colour, int style = wxSOLID); wxBrush(const wxBitmap &stippleBitmap); wxBrush(const wxBrush &brush); ~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;