Added wxQuantize, wxSplashScreen, wxEffects & added palette to wxImage

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

diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h
index 16ffdac9aad515ddaba442f7dc90fb337c7dba9b..d9f82e8eb1056e60a5fa424704eed5fa66e86645 100644 (file)
--- a/include/wx/mac/colour.h
+++ b/include/wx/mac/colour.h
@@ -64,7 +64,7 @@ public:
   unsigned char Blue() const { return m_blue; }
 
   // comparison
   unsigned char Blue() const { return m_blue; }
 
   // comparison

-  bool operator == (const wxColour& colour)
+  bool operator == (const wxColour& colour) const

   {
     return (m_red == colour.m_red && 
             m_green == colour.m_green && 
   {
     return (m_red == colour.m_red && 
             m_green == colour.m_green && 


@@ -74,9 +74,7 @@ public:
 
   void InitFromName(const wxString& col);
 
 
   void InitFromName(const wxString& col);
 

-/* TODO
-  WXCOLORREF GetPixel() const { return m_pixel; };
-*/
+  const WXCOLORREF GetPixel() const { return m_pixel; };

 
 private:
   bool          m_isInit;
 
 private:
   bool          m_isInit;


@@ -85,9 +83,8 @@ private:
   unsigned char m_green;
 
 public:
   unsigned char m_green;
 
 public:

-  /* TODO: implementation
-     WXCOLORREF m_pixel ;
-   */
+  WXCOLORREF m_pixel ;
+  void Set( WXCOLORREF color ) { m_pixel = color ; m_red = m_pixel.red>>8 ;m_blue = m_pixel.blue>>8 ;m_green = m_pixel.green>>8 ;}

 
 private:
   DECLARE_DYNAMIC_CLASS(wxColour)
 
 private:
   DECLARE_DYNAMIC_CLASS(wxColour)