Fixed tabs (i.e. turning into spaces...)

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

diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm
index bb835b291bbdb888f5d60f774c20936b581f9717..c58fd7604bb4abd2fad825f8346ab94106129ad0 100644 (file)
--- a/src/cocoa/brush.mm
+++ b/src/cocoa/brush.mm
@@ -9,9 +9,11 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/setup.h"
-#include "wx/utils.h"
-#include "wx/brush.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/brush.h"
+#endif //WX_PRECOMP
 #include "wx/colour.h"
 
 #import <AppKit/NSColor.h>
@@ -57,7 +59,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 wxBrushRefData::wxBrushRefData(const wxColour& colour, int style)
 {
     m_cocoaNSColor = NULL;
-    m_style = wxSOLID;
+    m_style = style;
     m_colour = colour;
 }
 
@@ -139,7 +141,6 @@ WX_NSColor wxBrushRefData::GetNSColor()
 // Brushes
 wxBrush::wxBrush()
 {
-    m_refData = new wxBrushRefData;
 }
 
 wxBrush::~wxBrush()
@@ -210,7 +211,8 @@ wxBitmap *wxBrush::GetStipple() const
 
 WX_NSColor wxBrush::GetNSColor()
 {
-    wxCHECK_MSG( Ok(), NULL, _T("invalid brush") );
+    if(!m_refData)
+        return [NSColor clearColor];
     return M_BRUSHDATA->GetNSColor();
 }