no change, just add comment about wxTheColourDatabase deletion

[wxWidgets.git] / src / cocoa / brush.mm

diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm
index 753c947cea5a40372dd70e12e10c1eed8d6324a3..6a1bce5e7f87fc286e91944d2cfc195eece29a83 100644 (file)
--- a/src/cocoa/brush.mm
+++ b/src/cocoa/brush.mm
@@ -6,13 +6,17 @@
 // 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:     wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/setup.h"
-#include "wx/utils.h"
+#include "wx/wxprec.h"
+

 #include "wx/brush.h"
 #include "wx/brush.h"

-#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/colour.h"
+#endif //WX_PRECOMP

 
 #import <AppKit/NSColor.h>
 
 
 #import <AppKit/NSColor.h>
 


@@ -92,7 +96,7 @@ bool wxBrushRefData::operator==(const wxBrushRefData& data) const
     // don't compare our NSColor
     return m_style == data.m_style &&
            m_colour == data.m_colour &&
     // don't compare our NSColor
     return m_style == data.m_style &&
            m_colour == data.m_colour &&

-           m_stipple == data.m_stipple;
+           m_stipple.IsSameAs(data.m_stipple);

 }
 
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
 }
 
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)


@@ -139,7 +143,6 @@ WX_NSColor wxBrushRefData::GetNSColor()
 // Brushes
 wxBrush::wxBrush()
 {
 // Brushes
 wxBrush::wxBrush()
 {

-    m_refData = new wxBrushRefData;

 }
 
 wxBrush::~wxBrush()
 }
 
 wxBrush::~wxBrush()


@@ -156,12 +159,12 @@ wxBrush::wxBrush(const wxBitmap& stipple)
     m_refData = new wxBrushRefData(stipple);
 }
 
     m_refData = new wxBrushRefData(stipple);
 }
 

-wxObjectRefData *wxBrush::CreateRefData() const
+wxGDIRefData *wxBrush::CreateGDIRefData() const

 {
     return new wxBrushRefData;
 }
 
 {
     return new wxBrushRefData;
 }
 

-wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxBrushRefData(*(wxBrushRefData *)data);
 }
 {
     return new wxBrushRefData(*(wxBrushRefData *)data);
 }


@@ -210,7 +213,7 @@ wxBitmap *wxBrush::GetStipple() const
 
 WX_NSColor wxBrush::GetNSColor()
 {
 
 WX_NSColor wxBrush::GetNSColor()
 {

-    wxCHECK_MSG( Ok(), NULL, _T("invalid brush") );
+    if(!m_refData)
+        return [NSColor clearColor];

     return M_BRUSHDATA->GetNSColor();
 }
     return M_BRUSHDATA->GetNSColor();
 }

-