X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb9d5bd07e7aa0b190c3ee60f5778a974ac9f87b..3ac1094bead05e30462122d00e4859725d2ea59f:/include/wx/mgl/brush.h?ds=sidebyside diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h index 7f7ab1a239..97fccfdd1a 100644 --- a/include/wx/mgl/brush.h +++ b/include/wx/mgl/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: brush.h +// Name: wx/mgl/brush.h // Purpose: // Author: Vaclav Slavik // Id: $Id$ @@ -7,14 +7,9 @@ // 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/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -25,8 +20,8 @@ // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxBrush; //----------------------------------------------------------------------------- // wxBrush @@ -38,12 +33,11 @@ public: wxBrush() {} wxBrush(const wxColour &colour, int style = wxSOLID); wxBrush(const wxBitmap &stippleBitmap); - wxBrush(const wxBrush &brush); - ~wxBrush() {} - wxBrush& operator = (const wxBrush& brush); + virtual ~wxBrush() {} bool operator == (const wxBrush& brush) const; bool operator != (const wxBrush& brush) const; - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; virtual int GetStyle() const; wxColour &GetColour() const;