added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h
index 16ffdac9aad515ddaba442f7dc90fb337c7dba9b..857eb6143cc4d3e14e1316fed1677bff6ec59b0e 100644 (file)
--- a/include/wx/mac/colour.h
+++ b/include/wx/mac/colour.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "colour.h"
 #endif
 
@@ -28,9 +28,17 @@ public:
   wxColour();
     // from RGB
   wxColour( unsigned char red, unsigned char green, unsigned char blue );
+  wxColour( unsigned long colRGB )
+      : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
+      { Set(colRGB); }
+  
     // implicit conversion from the colour name
-  wxColour( const wxString &colourName ) { InitFromName(colourName); }
-  wxColour( const char *colourName ) { InitFromName(colourName); }
+  wxColour( const wxString &colourName )
+      : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
+      { InitFromName(colourName); }
+  wxColour( const char *colourName )
+      : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
+      { InitFromName(colourName); }
 
     // copy ctors and assignment operators
   wxColour( const wxColour& col );
@@ -64,19 +72,18 @@ public:
   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);
   }
-  bool operator != (const wxColour& colour) { return !(*this == colour); }
+  bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
   void InitFromName(const wxString& col);
 
-/* TODO
-  WXCOLORREF GetPixel() const { return m_pixel; };
-*/
+  const WXCOLORREF& GetPixel() const { return m_pixel; };
 
 private:
   bool          m_isInit;
@@ -85,9 +92,8 @@ private:
   unsigned char m_green;
 
 public:
-  /* TODO: implementation
-     WXCOLORREF m_pixel ;
-   */
+  WXCOLORREF m_pixel ;
+  void Set( const WXCOLORREF* color ) ;
 
 private:
   DECLARE_DYNAMIC_CLASS(wxColour)