Committing in .

[wxWidgets.git] / include / wx / palmos / brush.h

diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h
index 2a7586612b249da7dc10bf8970616fe03212d7cb..a4a909a36018c1208dcb77ac697c06f7727071f5 100644 (file)
--- a/include/wx/palmos/brush.h
+++ b/include/wx/palmos/brush.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/brush.h
 // Purpose:     wxBrush class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/brush.h
 // Purpose:     wxBrush class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -26,7 +26,7 @@ class WXDLLEXPORT wxBrush;
 // wxBrush
 // ----------------------------------------------------------------------------
 
 // wxBrush
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBrush : public wxGDIObject
+class WXDLLEXPORT wxBrush : public wxBrushBase

 {
 public:
     wxBrush();
 {
 public:
     wxBrush();


@@ -45,7 +45,7 @@ public:
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() 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; }
     wxBitmap *GetStipple() const;
 
     bool Ok() const { return m_refData != NULL; }