X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7106497983220393044f3e74d6eccd9e8ee7b576..4521f6c88cbefa7f13e3733d344776b795f981e4:/src/cocoa/colour.mm

diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm
index 92c5ee515c..d7607a70d7 100644
--- a/src/cocoa/colour.mm
+++ b/src/cocoa/colour.mm
@@ -1,12 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/cococa/colour.mm
+// Name:        src/cocoa/colour.mm
 // Purpose:     wxColour class
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/06/17
-// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -18,11 +17,10 @@
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/ObjcRef.h"
 
 #import <AppKit/NSColor.h>
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-
 void wxColour::Init()
 {
     m_cocoaNSColor = NULL;
@@ -38,7 +36,7 @@ wxColour::wxColour (const wxColour& col)
 ,   m_blue(col.m_blue)
 ,   m_alpha(col.m_alpha)
 {
-    [m_cocoaNSColor retain];
+    wxGCSafeRetain(m_cocoaNSColor);
 }
 
 wxColour::wxColour( WX_NSColor aColor )
@@ -49,28 +47,27 @@ wxColour::wxColour( WX_NSColor aColor )
 
 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_cocoaNSColor retain];
     return *this;
 }
 
 wxColour::~wxColour ()
 {
-    [m_cocoaNSColor release];
+    wxGCSafeRelease(m_cocoaNSColor);
 }
 
-void wxColour::InitWith(unsigned char r,
+void wxColour::InitRGBA(unsigned char r,
                         unsigned char g,
                         unsigned char b,
                         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;
@@ -79,8 +76,8 @@ void wxColour::InitWith(unsigned char r,
 
 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