Fixed typos in comments (patch #1515724)

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

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index f84671f77fdaa885d0a7ff2a44971eba9fcab4c7..3abeee88ea8657a1c0b2bae291136184b8e7b4c1 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -16,7 +16,7 @@
 #include "wx/string.h"
 
 // Colour
 #include "wx/string.h"
 
 // Colour

-class WXDLLEXPORT wxColour: public wxObject
+class WXDLLEXPORT wxColour: public wxColourBase

 {
 public:
     // constructors
 {
 public:
     // constructors


@@ -24,39 +24,11 @@ public:
 
     // default
     wxColour() { Init(); }
 
     // default
     wxColour() { Init(); }

-
-    // from separate RGB
-    wxColour( unsigned char red, unsigned char green, unsigned char blue )
-        { Set(red, green, blue); }
-
-    // from packed RGB
-    wxColour( unsigned long colRGB )
-        { Set(colRGB); }
-
-    // implicit conversion from the colour name
-    wxColour( const wxString &colourName )
-        { InitFromName(colourName); }
-    wxColour( const wxChar *colourName )
-        { InitFromName(colourName); }
-
-    // copy ctors and assignment operators
-    wxColour( const wxColour& col );
-    wxColour& operator = ( const wxColour& col );
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS

 
     // dtor
     ~wxColour();
 
 
     // dtor
     ~wxColour();
 

-    // Set() functions
-    void Set( unsigned char red, unsigned char green, unsigned char blue );
-    void Set( unsigned long colRGB )
-    {
-        // we don't need to know sizeof(long) here because we assume that the three
-        // least significant bytes contain the R, G and B values
-        Set((unsigned char)colRGB,
-            (unsigned char)(colRGB >> 8),
-            (unsigned char)(colRGB >> 16));
-    }
-

     // accessors
     bool Ok() const {return m_isInit; }
 
     // accessors
     bool Ok() const {return m_isInit; }
 


@@ -76,13 +48,13 @@ public:
 
     const WXCOLORREF& GetPixel() const { return m_pixel; };
 
 
     const WXCOLORREF& GetPixel() const { return m_pixel; };
 

-    void InitFromName(const wxString& col);
-

 protected :
 
     // Helper function
     void Init();
 
 protected :
 
     // Helper function
     void Init();
 

+    void InitWith( unsigned char red, unsigned char green, unsigned char blue );
+

 private:
     bool          m_isInit;
     unsigned char m_red;
 private:
     bool          m_isInit;
     unsigned char m_red;


@@ -91,7 +63,8 @@ private:
 
 public:
     WXCOLORREF m_pixel ;
 
 public:
     WXCOLORREF m_pixel ;

-    void Set( const WXCOLORREF* color ) ;
+    void FromRGBColor( const WXCOLORREF* color ) ;
+    

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