X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc536d358374987326d93adb1012b6eda9435a0..4f32b3cf15277e10835d359acb8b3e87ee041699:/include/wx/mac/classic/colour.h

diff --git a/include/wx/mac/classic/colour.h b/include/wx/mac/classic/colour.h
index 785325450f..f010271fc6 100644
--- a/include/wx/mac/classic/colour.h
+++ b/include/wx/mac/classic/colour.h
@@ -16,7 +16,7 @@
 #include "wx/string.h"
 
 // Colour
-class WXDLLEXPORT wxColour: public wxObject
+class WXDLLEXPORT wxColour: public wxColourBase
 {
 public:
     // constructors
@@ -24,20 +24,7 @@ public:
 
     // 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); }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
     wxColour( const wxColour& col );
@@ -45,21 +32,11 @@ public:
     wxColour& operator = ( const wxColour& col );
 
     // 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));
-    }
+    virtual ~wxColour();
 
     // accessors
-    bool Ok() const {return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const {return m_isInit; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
@@ -77,13 +54,13 @@ public:
 
     const WXCOLORREF& GetPixel() const { return m_pixel; };
 
-    void InitFromName(const wxString& col);
-
-protected :
+protected:
 
     // Helper function
     void Init();
 
+    void InitWith( unsigned char red, unsigned char green, unsigned char blue );
+
 private:
     bool          m_isInit;
     unsigned char m_red;