Applied notebook font patch.

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

diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h
index b75929d1ced8b0ae9b9ae29a1fec738ddc043a02..158e631d644bddc4d514c4aefe7124e69b49eca4 100644 (file)
--- a/include/wx/mac/colour.h
+++ b/include/wx/mac/colour.h
@@ -25,19 +25,17 @@ class WXDLLEXPORT wxColour: public wxObject
 public:
   // ctors
     // default
 public:
   // ctors
     // default

-  wxColour();
+  wxColour() { Init(); }

     // from RGB
     // from RGB

-  wxColour( unsigned char red, unsigned char green, unsigned char blue );
+  wxColour( unsigned char red, unsigned char green, unsigned char blue )
+      { Set(red, green, blue); }

   wxColour( unsigned long colRGB )
   wxColour( unsigned long colRGB )

-      : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)

       { Set(colRGB); }
       { Set(colRGB); }

-  
+

     // implicit conversion from the colour name
   wxColour( const wxString &colourName )
     // implicit conversion from the colour name
   wxColour( const wxString &colourName )

-      : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)

       { InitFromName(colourName); }
   wxColour( const wxChar *colourName )
       { InitFromName(colourName); }
   wxColour( const wxChar *colourName )

-      : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)

       { InitFromName(colourName); }
 
     // copy ctors and assignment operators
       { InitFromName(colourName); }
 
     // copy ctors and assignment operators


@@ -62,11 +60,6 @@ public:
   // accessors
   bool Ok() const {return m_isInit; }
 
   // accessors
   bool Ok() const {return m_isInit; }
 

-  // Let's remove this inelegant function
-#if WXWIN_COMPATIBILITY
-  void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
-#endif
-

   unsigned char Red() const { return m_red; }
   unsigned char Green() const { return m_green; }
   unsigned char Blue() const { return m_blue; }
   unsigned char Red() const { return m_red; }
   unsigned char Green() const { return m_green; }
   unsigned char Blue() const { return m_blue; }


@@ -74,17 +67,22 @@ public:
   // comparison
   bool operator == (const wxColour& colour) const
   {
   // 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); }
 
   }
   bool operator != (const wxColour& colour) const { return !(*this == colour); }
 

-  void InitFromName(const wxString& col);
-

   const WXCOLORREF& GetPixel() const { return m_pixel; };
 
   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;
 private:
   bool          m_isInit;
   unsigned char m_red;