Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

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

diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm
index 914408e291fbb1fc10d727aa80c340f800d7ba2b..df7e25e0d054b1415f1b7894ba3c3c5d80205145 100644 (file)
--- a/src/cocoa/colour.mm
+++ b/src/cocoa/colour.mm
@@ -6,7 +6,7 @@
 // Created:     2003/06/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/06/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -18,11 +18,10 @@
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"

+#include "wx/cocoa/ObjcRef.h"

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

-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-

 void wxColour::Init()
 {
     m_cocoaNSColor = NULL;
 void wxColour::Init()
 {
     m_cocoaNSColor = NULL;


@@ -38,7 +37,7 @@ wxColour::wxColour (const wxColour& col)
 ,   m_blue(col.m_blue)
 ,   m_alpha(col.m_alpha)
 {
 ,   m_blue(col.m_blue)
 ,   m_alpha(col.m_alpha)
 {

-    [m_cocoaNSColor retain];
+    wxGCSafeRetain(m_cocoaNSColor);

 }
 
 wxColour::wxColour( WX_NSColor aColor )
 }
 
 wxColour::wxColour( WX_NSColor aColor )


@@ -49,18 +48,17 @@ wxColour::wxColour( WX_NSColor aColor )
 
 wxColour& wxColour::operator =(const wxColour& col)
 {
 
 wxColour& wxColour::operator =(const wxColour& col)
 {

-    m_cocoaNSColor = col.m_cocoaNSColor;
+    m_cocoaNSColor = wxGCSafeRetain(col.m_cocoaNSColor);

     m_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;
     m_alpha = col.m_alpha;
     m_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;
     m_alpha = col.m_alpha;

-    [m_cocoaNSColor retain];

     return *this;
 }
 
 wxColour::~wxColour ()
 {
     return *this;
 }
 
 wxColour::~wxColour ()
 {

-    [m_cocoaNSColor release];
+    wxGCSafeRelease(m_cocoaNSColor);

 }
 
 void wxColour::InitRGBA(unsigned char r,
 }
 
 void wxColour::InitRGBA(unsigned char r,


@@ -69,8 +67,8 @@ void wxColour::InitRGBA(unsigned char r,
                         unsigned char a)
 {
     wxAutoNSAutoreleasePool pool;
                         unsigned char a)
 {
     wxAutoNSAutoreleasePool pool;

-    [m_cocoaNSColor release];
-    m_cocoaNSColor = [[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:a/255.0] retain];
+    wxGCSafeRelease(m_cocoaNSColor);
+    m_cocoaNSColor = wxGCSafeRetain([NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:a/255.0]);

     m_red = r;
     m_green = g;
     m_blue = b;
     m_red = r;
     m_green = g;
     m_blue = b;


@@ -79,8 +77,8 @@ void wxColour::InitRGBA(unsigned char r,
 
 void wxColour::Set( WX_NSColor aColor )
 {
 
 void wxColour::Set( WX_NSColor aColor )
 {

-    [aColor retain];
-    [m_cocoaNSColor release];
+    wxGCSafeRetain(aColor);
+    wxGCSafeRelease(m_cocoaNSColor);

     m_cocoaNSColor = aColor;
 
     /* Make a temporary color in RGB format and get the values.  Note that
     m_cocoaNSColor = aColor;
 
     /* Make a temporary color in RGB format and get the values.  Note that