Always use XPMs in this sample

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

diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h
index 88deff7b3c84fc48e821082d23004a8531b556fd..158e631d644bddc4d514c4aefe7124e69b49eca4 100644 (file)
--- a/include/wx/mac/colour.h
+++ b/include/wx/mac/colour.h
@@ -31,7 +31,7 @@ public:
       { Set(red, green, blue); }
   wxColour( unsigned long colRGB )
       { Set(colRGB); }
-  
+
     // implicit conversion from the colour name
   wxColour( const wxString &colourName )
       { InitFromName(colourName); }
@@ -67,25 +67,28 @@ public:
   // comparison
   bool operator == (const wxColour& colour) const
   {
-    return (m_isInit == colour.m_isInit &&
-            m_red == colour.m_red && 
-            m_green == colour.m_green && 
-            m_blue == colour.m_blue);
+    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) const { return !(*this == colour); }
 
-  void InitFromName(const wxString& col);
-
   const WXCOLORREF& GetPixel() const { return m_pixel; };
 
+    void InitFromName(const wxString& col);
+
+protected :
+
+    // Helper function
+    void Init();
+
 private:
   bool          m_isInit;
   unsigned char m_red;
   unsigned char m_blue;
   unsigned char m_green;
 
-  void Init();
-
 public:
   WXCOLORREF m_pixel ;
   void Set( const WXCOLORREF* color ) ;