removed src/gtk/eggtrayicon.h

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

diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm
index b755914c4c77d25d61ef422feddf0d7bd7657980..598fad8e00baa1e6614a7bebfd722d2eebd3cc1d 100644 (file)
--- a/src/cocoa/colour.mm
+++ b/src/cocoa/colour.mm
@@ -6,20 +6,28 @@
 // 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:    wxWindows licence
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#import <AppKit/NSColor.h>
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP

 
 #include "wx/gdicmn.h"
 #include "wx/colour.h"
 
 
 #include "wx/gdicmn.h"
 #include "wx/colour.h"
 

+#include "wx/cocoa/autorelease.h"
+
+#import <AppKit/NSColor.h>
+

 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 

-wxColour::wxColour ()
-:   m_cocoaNSColor(NULL)
+void wxColour::Init()

 {
 {

-    m_red = m_blue = m_green = 0;
+    m_cocoaNSColor = NULL;
+    m_red =
+    m_blue =
+    m_green = 0;

 }
 
 wxColour::wxColour (const wxColour& col)
 }
 
 wxColour::wxColour (const wxColour& col)


@@ -41,21 +49,20 @@ wxColour& wxColour::operator =(const wxColour& col)
     return *this;
 }
 
     return *this;
 }
 

-void wxColour::InitFromName(const wxString& col)
+void wxColour::InitFromName(const wxString& name)

 {
 {

-    wxColour *the_colour = wxTheColourDatabase->FindColour (col);
-    if (the_colour)
+    if ( wxTheColourDatabase )

     {
     {

-        *this = *the_colour;
-    }
-    else
-    {
-        [m_cocoaNSColor release];
-        m_cocoaNSColor = NULL;
-        m_red = 0;
-        m_green = 0;
-        m_blue = 0;
+        wxColour col = wxTheColourDatabase->Find(name);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }

     }
     }

+
+    // leave invalid
+    Init();

 }
 
 wxColour::~wxColour ()
 }
 
 wxColour::~wxColour ()


@@ -65,6 +72,7 @@ wxColour::~wxColour ()
 
 void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
 {
 
 void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
 {

+    wxAutoNSAutoreleasePool pool;

     [m_cocoaNSColor release];
     m_cocoaNSColor = [[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1.0] retain];
     m_red = r;
     [m_cocoaNSColor release];
     m_cocoaNSColor = [[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1.0] retain];
     m_red = r;