Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

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

diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h
index 13f24cc716ff51aa97f1753129bff678acac8756..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_
 
 #ifndef _WX_COLOUR_H_
 #define _WX_COLOUR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "colour.h"
 #endif
 
 #pragma interface "colour.h"
 #endif
 


@@ -28,11 +28,17 @@ 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); }
+  wxColour( unsigned long colRGB )
+      : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
+      { Set(colRGB); }

   
     // implicit conversion from the colour name
   
     // 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 );
 
     // copy ctors and assignment operators
   wxColour( const wxColour& col );


@@ -73,7 +79,7 @@ public:
             m_green == colour.m_green && 
             m_blue == colour.m_blue);
   }
             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);
 
 
   void InitFromName(const wxString& col);