X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..8312c461b8bae95adf2f75c7be4e6bab3b1ceb47:/include/wx/palmos/brush.h diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h index 2a7586612b..4e2cbbbb0f 100644 --- a/include/wx/palmos/brush.h +++ b/include/wx/palmos/brush.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/palmos/brush.h // Purpose: wxBrush class -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,10 +12,6 @@ #ifndef _WX_BRUSH_H_ #define _WX_BRUSH_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "brush.h" -#endif - #include "wx/gdicmn.h" #include "wx/gdiobj.h" #include "wx/bitmap.h" @@ -26,13 +22,12 @@ 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); } virtual ~wxBrush(); virtual void SetColour(const wxColour& col); @@ -40,12 +35,11 @@ public: virtual void SetStyle(int style); virtual void SetStipple(const wxBitmap& stipple); - wxBrush& operator=(const wxBrush& brush); bool operator==(const wxBrush& brush) const; 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; }