wxUniv: implement wxSYS_VSCROLL_X/Y metrics in wxUniv code, they depend on the theme...

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

diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h
index dfee4ddf87a9967b7088c710f380631cb9f16562..965e35f109503062a08876aa2eeac7b6538ab292 100644 (file)
--- a/include/wx/cocoa/brush.h
+++ b/include/wx/cocoa/brush.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/cocoa/brush.h
+// Name:        wx/cocoa/brush.h

 // Purpose:     wxBrush class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Purpose:     wxBrush class
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/03
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

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


@@ -16,12 +16,12 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;

 
 // ========================================================================
 // wxBrush
 // ========================================================================
 
 // ========================================================================
 // wxBrush
 // ========================================================================

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

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


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

-    wxBrush(const wxColour& col, int style = wxSOLID);
+    wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif

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

-    wxBrush(const wxBrush& brush)
-    :   wxGDIObject()
-    {   Ref(brush); }
-    ~wxBrush();
+    virtual ~wxBrush();

 
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------

-    virtual void SetColour(const wxColour& col)  ;
-    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
-    virtual void SetStyle(int style)  ;
-    virtual void SetStipple(const wxBitmap& stipple)  ;
-
-    // assignment
-    wxBrush& operator = (const wxBrush& brush)
-    {   if (*this == brush) return (*this); Ref(brush); return *this; }
+    virtual void SetColour(const wxColour& col) ;
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
+    virtual void SetStyle(wxBrushStyle style) ;
+    virtual void SetStipple(const wxBitmap& stipple) ;

 
     // comparison
 
     // comparison

-    bool operator == (const wxBrush& brush)
+    bool operator == (const wxBrush& brush) const

     {   return m_refData == brush.m_refData; }
     {   return m_refData == brush.m_refData; }

-    bool operator != (const wxBrush& brush)
+    bool operator != (const wxBrush& brush) const

     {   return m_refData != brush.m_refData; }
 
     // accessors
     wxColour GetColour() const;
     {   return m_refData != brush.m_refData; }
 
     // accessors
     wxColour GetColour() const;

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

     wxBitmap *GetStipple() const;
 
     wxBitmap *GetStipple() const;
 

-    virtual bool Ok() const
-    {   return (m_refData != NULL); }
-
-    // wxObjectRefData
-    wxObjectRefData *CreateRefData() const;
-    wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-

     // wxCocoa
     WX_NSColor GetNSColor();
     // wxCocoa
     WX_NSColor GetNSColor();

+
+protected:
+    wxGDIRefData *CreateGDIRefData() const;
+    wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 };
 
 #endif // __WX_COCOA_BRUSH_H__
 };
 
 #endif // __WX_COCOA_BRUSH_H__