removed src/gtk/eggtrayicon.h

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

diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm
index bb835b291bbdb888f5d60f774c20936b581f9717..3e24adc742d60629eb728d31bc3e838a3bb97c89 100644 (file)
--- a/src/cocoa/brush.mm
+++ b/src/cocoa/brush.mm
@@ -6,12 +6,14 @@
 // 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/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>
 #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;
 wxBrushRefData::wxBrushRefData(const wxColour& colour, int style)
 {
     m_cocoaNSColor = NULL;

-    m_style = wxSOLID;
+    m_style = style;

     m_colour = colour;
 }
 
     m_colour = colour;
 }
 


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

-    m_refData = new wxBrushRefData;

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


@@ -210,7 +211,8 @@ 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();
 }