don't return HTCLIENT for static bitmaps, this breaks mouse (leave) event generation

[wxWidgets.git] / include / wx / cocoa / colour.h

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index 3b1fe9706a4d6d620793c7eaba5d8ceb94ef0e14..9200c35502de1e401ead3c53994613f49b517e51 100644 (file)
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -31,11 +31,17 @@ public:
     :   m_cocoaNSColor(NULL)
     {   Set(colRGB); }
 
     :   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)); }
     // 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 );
 
     // copy ctors and assignment operators
     wxColour( const wxColour& col );


@@ -54,11 +60,11 @@ public:
     // comparison
     bool operator == (const wxColour& colour) const
     {
     // 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
         return (m_cocoaNSColor == colour.m_cocoaNSColor

-            && m_red == colour.m_red
+            || (m_red == colour.m_red

             && m_green == colour.m_green
             && m_green == colour.m_green

-            && m_blue == colour.m_blue);
+            && m_blue == colour.m_blue));

     }
     bool operator != (const wxColour& colour) const
     {   return !(*this == colour); }
     }
     bool operator != (const wxColour& colour) const
     {   return !(*this == colour); }


@@ -73,6 +79,7 @@ public:
             (unsigned char)(colRGB >> 8),
             (unsigned char)(colRGB >> 16));
     }
             (unsigned char)(colRGB >> 8),
             (unsigned char)(colRGB >> 16));
     }

+    void Set( WX_NSColor aColor );

 
 protected:
     // puts the object in an invalid, uninitialized state
 
 protected:
     // puts the object in an invalid, uninitialized state