more VC6 fixes: nested value must be real classes, not typedefs; skeleton declaration...

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

diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h
index 205e7b7a2dea5e0d1406ed5286bf8f09b938c40d..facbc7194d6281865ecf9dcb51b7eb85e40aadae 100644 (file)
--- a/include/wx/cocoa/brush.h
+++ b/include/wx/cocoa/brush.h
@@ -1,68 +1,63 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        brush.h
+// Name:        wx/cocoa/brush.h
 // Purpose:     wxBrush class
-// Author:      AUTHOR
+// Author:      David Elliott <dfe@cox.net>
 // Modified by:
-// Created:     ??/??/98
+// Created:     2003/07/03
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) 2003 David Elliott
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_BRUSH_H_
-#define _WX_BRUSH_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "brush.h"
-#endif
+#ifndef __WX_COCOA_BRUSH_H__
+#define __WX_COCOA_BRUSH_H__
 
 #include "wx/gdicmn.h"
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;
 
-// Brush
-class WXDLLEXPORT wxBrush: public wxGDIObject
+// ========================================================================
+// wxBrush
+// ========================================================================
+class WXDLLEXPORT wxBrush: public wxBrushBase
 {
-  DECLARE_DYNAMIC_CLASS(wxBrush)
-
+    DECLARE_DYNAMIC_CLASS(wxBrush)
+// ------------------------------------------------------------------------
+// initialization
+// ------------------------------------------------------------------------
 public:
-  wxBrush();
-  wxBrush(const wxColour& col, int style);
-  wxBrush(const wxBitmap& stipple);
-  wxBrush(const wxBrush& brush)
-      : wxGDIObject()
-      { Ref(brush); }
-  ~wxBrush();
-
-  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)  ;
-
-  wxBrush& operator = (const wxBrush& brush)
-  { if (*this == brush) return (*this); Ref(brush); return *this; }
-  bool operator == (const wxBrush& brush)
-  { return m_refData == brush.m_refData; }
-  bool operator != (const wxBrush& brush)
-  { return m_refData != brush.m_refData; }
-
-  wxColour& GetColour() const ;
-  int GetStyle() const ;
-  wxBitmap *GetStipple() const ;
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
+    wxBrush();
+    wxBrush(const wxColour& col, int style = wxSOLID);
+    wxBrush(const wxBitmap& stipple);
+    virtual ~wxBrush();
 
+// ------------------------------------------------------------------------
 // Implementation
-
-  // Useful helper: create the brush resource
-  bool RealizeResource();
-
-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
+// ------------------------------------------------------------------------
+    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) ;
+
+    // comparison
+    bool operator == (const wxBrush& brush) const
+    {   return m_refData == brush.m_refData; }
+    bool operator != (const wxBrush& brush) const
+    {   return m_refData != brush.m_refData; }
+
+    // accessors
+    wxColour GetColour() const;
+    virtual int GetStyle() const;
+    wxBitmap *GetStipple() const;
+
+    // wxCocoa
+    WX_NSColor GetNSColor();
+
+protected:
+    wxGDIRefData *CreateGDIRefData() const;
+    wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 };
 
-#endif
-    // _WX_BRUSH_H_
+#endif // __WX_COCOA_BRUSH_H__