non-PCH compilo

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

diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm
index 598fad8e00baa1e6614a7bebfd722d2eebd3cc1d..9598fe838cd665c287875c4f15f3755251400fdf 100644 (file)
--- a/src/cocoa/colour.mm
+++ b/src/cocoa/colour.mm
@@ -1,22 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.mm
+// Name:        src/cococa/colour.mm

 // Purpose:     wxColour class
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/06/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Purpose:     wxColour class
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/06/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

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

-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP

 
 

-#include "wx/gdicmn.h"

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

+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif //WX_PRECOMP
+

 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/autorelease.h"

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

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


@@ -35,48 +37,58 @@ wxColour::wxColour (const wxColour& col)
 ,   m_red(col.m_red)
 ,   m_green(col.m_green)
 ,   m_blue(col.m_blue)
 ,   m_red(col.m_red)
 ,   m_green(col.m_green)
 ,   m_blue(col.m_blue)

+,   m_alpha(col.m_alpha)
+{
+    wxGCSafeRetain(m_cocoaNSColor);
+}
+
+wxColour::wxColour( WX_NSColor aColor )
+:   m_cocoaNSColor(nil)

 {
 {

-    [m_cocoaNSColor retain];
+    Set(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_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;

-    [m_cocoaNSColor retain];
+    m_alpha = col.m_alpha;

     return *this;
 }
 
     return *this;
 }
 

-void wxColour::InitFromName(const wxString& name)
-{
-    if ( wxTheColourDatabase )
-    {
-        wxColour col = wxTheColourDatabase->Find(name);
-        if ( col.Ok() )
-        {
-            *this = col;
-            return;
-        }
-    }
-
-    // leave invalid
-    Init();
-}
-

 wxColour::~wxColour ()
 {
 wxColour::~wxColour ()
 {

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

 }
 
 }
 

-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::InitRGBA(unsigned char r,
+                        unsigned char g,
+                        unsigned char b,
+                        unsigned char a)

 {
     wxAutoNSAutoreleasePool pool;
 {
     wxAutoNSAutoreleasePool pool;

-    [m_cocoaNSColor release];
-    m_cocoaNSColor = [[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1.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;

+    m_alpha = a;

 }
 
 }
 

+void wxColour::Set( WX_NSColor aColor )
+{
+    wxGCSafeRetain(aColor);
+    wxGCSafeRelease(m_cocoaNSColor);
+    m_cocoaNSColor = aColor;
+
+    /* Make a temporary color in RGB format and get the values.  Note that
+       unless the color was actually RGB to begin with it's likely that
+       these will be fairly bogus. Particulary if the color is a pattern. */
+    NSColor *rgbColor = [m_cocoaNSColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+    m_red   = (wxUint8) ([rgbColor redComponent]   * 255.0);
+    m_green = (wxUint8) ([rgbColor greenComponent] * 255.0);
+    m_blue  = (wxUint8) ([rgbColor blueComponent]  * 255.0);
+    m_alpha  = (wxUint8) ([rgbColor alphaComponent]  * 255.0);
+}