X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/211436b6f42e426ac1cbbf1a1a95cd637fc47280..27b2dd53f629a78266c51d1b0b5db918401dcd4f:/include/wx/cocoa/colour.h?ds=inline

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index 3b1fe9706a..9200c35502 100644
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -31,11 +31,17 @@ public:
     :   m_cocoaNSColor(NULL)
     {   Set(colRGB); }
 
+    // initialization using existing NSColor
+    wxColour( WX_NSColor aColor );
+
     // implicit conversion from the colour name
     wxColour( const wxString &colourName )
     {   InitFromName(colourName); }
     wxColour( const char *colourName )
     {   InitFromName(wxString::FromAscii(colourName)); }
+#if wxUSE_UNICODE
+    wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
+#endif
 
     // copy ctors and assignment operators
     wxColour( const wxColour& col );
@@ -54,11 +60,11 @@ public:
     // comparison
     bool operator == (const wxColour& colour) const
     {
-        // VZ: sure we want to compare NSColor objects for equality here?
+        // TODO: Really compare the NSColor
         return (m_cocoaNSColor == colour.m_cocoaNSColor
-            && m_red == colour.m_red
+            || (m_red == colour.m_red
             && m_green == colour.m_green
-            && m_blue == colour.m_blue);
+            && m_blue == colour.m_blue));
     }
     bool operator != (const wxColour& colour) const
     {   return !(*this == colour); }
@@ -73,6 +79,7 @@ public:
             (unsigned char)(colRGB >> 8),
             (unsigned char)(colRGB >> 16));
     }
+    void Set( WX_NSColor aColor );
 
 protected:
     // puts the object in an invalid, uninitialized state