fix evtloop.h header dependency

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

diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm
index 59cd8dea7fea304137f4affa5b1d526c2f68bf1a..6a1bce5e7f87fc286e91944d2cfc195eece29a83 100644 (file)
--- a/src/cocoa/brush.mm
+++ b/src/cocoa/brush.mm
@@ -15,10 +15,9 @@
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"

+    #include "wx/colour.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/colour.h"
-

 #import <AppKit/NSColor.h>
 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 #import <AppKit/NSColor.h>
 
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData


@@ -97,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)


@@ -160,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);
 }