add virtual DoGetTextExtent() to allow calling the overloaded wxWindowBase::GetTextEx...

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

diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm
index cc58fcb9f224b3c6a78b207bf68186bb5ec59920..9598fe838cd665c287875c4f15f3755251400fdf 100644 (file)
--- a/src/cocoa/colour.mm
+++ b/src/cocoa/colour.mm
@@ -14,11 +14,11 @@
 #include "wx/colour.h"
 
 #ifndef WX_PRECOMP
 #include "wx/colour.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/gdicmn.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/gdicmn.h"
-

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

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

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


@@ -37,8 +37,9 @@ 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)

 {
 {

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

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


@@ -49,33 +50,37 @@ 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_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;

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

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

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

 }
 
 }
 

-void wxColour::InitWith (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 )
 {
 }
 
 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


@@ -85,4 +90,5 @@ void wxColour::Set( WX_NSColor aColor )
     m_red   = (wxUint8) ([rgbColor redComponent]   * 255.0);
     m_green = (wxUint8) ([rgbColor greenComponent] * 255.0);
     m_blue  = (wxUint8) ([rgbColor blueComponent]  * 255.0);
     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);

 }
 }