X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc536d358374987326d93adb1012b6eda9435a0..f8b1df0b15f843b8f47efb9bee38f1de0fa95020:/include/wx/os2/colour.h?ds=sidebyside

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index 5717abd0af..7b92b0db03 100644
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -15,24 +15,12 @@
 #include "wx/object.h"
 
 // Colour
-class WXDLLEXPORT wxColour: public wxObject
+class WXDLLEXPORT wxColour: public wxColourBase
 {
 public:
     // constructors
     // ------------
-
-    // default
-    wxColour();
-
-    // from separate RGB
-    wxColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue );
-
-    // from packed RGB
-    wxColour( unsigned long colRGB ) { Set(colRGB); }
-
-    // Implicit conversion from the colour name
-    wxColour(const wxString& rColourName) { InitFromName(rColourName); }
-    wxColour(const wxChar *zColourName) { InitFromName(zColourName); }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // Copy ctors and assignment operators
     wxColour(const wxColour& rCol);
@@ -40,26 +28,10 @@ public:
     wxColour&operator = (const wxColour& rCol);
 
     // Dtor
-    ~wxColour();
-
-    // Set functions
-    void Set( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
-    void Set( unsigned long lColRGB)
-    {
-        // 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)lColRGB
-            ,(unsigned char)(lColRGB >> 8)
-            ,(unsigned char)(lColRGB >> 16)
-           );
-    }
-    void Set(const wxString& rsColour)
-    {
-        InitFromName(rsColour);
-    }
+    virtual ~wxColour();
 
     // Accessors
-    bool Ok(void) const {return m_bIsInit; }
+    virtual bool IsOk(void) const { return m_bIsInit; }
 
     unsigned char Red(void) const { return m_cRed; }
     unsigned char Green(void) const { return m_cGreen; }
@@ -79,17 +51,19 @@ public:
 
     WXCOLORREF GetPixel(void) const { return m_vPixel; };
 
-    void InitFromName(const wxString& rCol);
 
 private:
 
     // Helper function
     void Init();
 
-    bool                            m_bIsInit;
-    unsigned char                   m_cRed;
-    unsigned char                   m_cBlue;
-    unsigned char                   m_cGreen;
+    bool           m_bIsInit;
+    unsigned char  m_cRed;
+    unsigned char  m_cBlue;
+    unsigned char  m_cGreen;
+
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
 public:
     WXCOLORREF                      m_vPixel ;