surround deprecated wxImage methods in WXWIN_COMPATIBILITY_2_2

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

diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h
index 407c0140cafb13f004b0c11c7dd8c9ee607dedff..13f24cc716ff51aa97f1753129bff678acac8756 100644 (file)
--- a/include/wx/mac/colour.h
+++ b/include/wx/mac/colour.h
@@ -28,6 +28,8 @@ public:
   wxColour();
     // from RGB
   wxColour( unsigned char red, unsigned char green, unsigned char blue );
   wxColour();
     // from RGB
   wxColour( unsigned char red, unsigned char green, unsigned char blue );

+  wxColour( unsigned long colRGB ) { Set(colRGB); }
+  

     // implicit conversion from the colour name
   wxColour( const wxString &colourName ) { InitFromName(colourName); }
   wxColour( const char *colourName ) { InitFromName(colourName); }
     // implicit conversion from the colour name
   wxColour( const wxString &colourName ) { InitFromName(colourName); }
   wxColour( const char *colourName ) { InitFromName(colourName); }


@@ -64,9 +66,10 @@ 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 && 
+    return (m_isInit == colour.m_isInit &&
+            m_red == colour.m_red && 

             m_green == colour.m_green && 
             m_blue == colour.m_blue);
   }
             m_green == colour.m_green && 
             m_blue == colour.m_blue);
   }


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

-  const WXCOLORREF GetPixel() const { return m_pixel; };
+  const WXCOLORREF& GetPixel() const { return m_pixel; };

 
 private:
   bool          m_isInit;
 
 private:
   bool          m_isInit;


@@ -84,7 +87,7 @@ private:
 
 public:
   WXCOLORREF m_pixel ;
 
 public:
   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 ;}
+  void Set( const WXCOLORREF* color ) ;

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