fixed bug in Set() on DST days (patch 1097811)

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

diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h
index 28e4efa76f87d946f2bd891cfd84095b1c9e0530..e3d793db541696443505f5924c3d038b0c878e61 100644 (file)
--- a/include/wx/cocoa/brush.h
+++ b/include/wx/cocoa/brush.h
@@ -6,7 +6,7 @@
 // Created:     2003/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BRUSH_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BRUSH_H__


@@ -21,7 +21,7 @@ class WXDLLEXPORT wxBrush;
 // ========================================================================
 // wxBrush
 // ========================================================================
 // ========================================================================
 // wxBrush
 // ========================================================================

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

 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 // ------------------------------------------------------------------------
 {
     DECLARE_DYNAMIC_CLASS(wxBrush)
 // ------------------------------------------------------------------------


@@ -29,10 +29,10 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 // ------------------------------------------------------------------------
 public:
     wxBrush();
 // ------------------------------------------------------------------------
 public:
     wxBrush();

-    wxBrush(const wxColour& col, int style);
+    wxBrush(const wxColour& col, int style = wxSOLID);

     wxBrush(const wxBitmap& stipple);
     wxBrush(const wxBrush& brush)
     wxBrush(const wxBitmap& stipple);
     wxBrush(const wxBrush& brush)

-    :   wxGDIObject()
+    :   wxBrushBase()

     {   Ref(brush); }
     ~wxBrush();
 
     {   Ref(brush); }
     ~wxBrush();
 


@@ -56,7 +56,7 @@ public:
 
     // accessors
     wxColour GetColour() const;
 
     // accessors
     wxColour GetColour() const;

-    int GetStyle() const;
+    virtual int GetStyle() const;

     wxBitmap *GetStipple() const;
 
     virtual bool Ok() const
     wxBitmap *GetStipple() const;
 
     virtual bool Ok() const