Build fix based on wxOS2 night build log.

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

diff --git a/include/wx/mgl/colour.h b/include/wx/mgl/colour.h
index 68503b49a7354b60ff3a2e33680d6e3f5a63a9dd..892509205e5e7108a2d008ecc8a54f4b905486d6 100644 (file)
--- a/include/wx/mgl/colour.h
+++ b/include/wx/mgl/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.h
+// Name:        wx/mgl/colour.h
 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
@@ -15,40 +15,23 @@
 #include "wx/object.h"
 
 // Colour
-class WXDLLEXPORT wxColour: public wxObject
+class WXDLLEXPORT wxColour: public wxColourBase
 {
 public:
-    // ctors
-      // default
-    wxColour();
-      // from RGB
-    wxColour(unsigned char red, unsigned char green, unsigned char blue)
-        { Set(red, green, blue); }
-    wxColour(unsigned long colRGB) { Set(colRGB); }
-
-      // implicit conversion from the colour name
-    wxColour(const wxString &colourName) { InitFromName(colourName); }
-    wxColour(const char *colourName) { InitFromName(colourName); }
+    // constructors
+    // ------------
 
+    // default
+    wxColour();
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
-      // copy ctors and assignment operators
+    // copy ctors and assignment operators
     wxColour(const wxColour& col);
     wxColour& operator = (const wxColour& col);
 
-      // dtor
+    // 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; }
 
@@ -59,20 +42,21 @@ public:
     // comparison
     bool operator == (const wxColour& colour) const
     {
-      return (m_red == colour.m_red &&
-              m_green == colour.m_green &&
-              m_blue == colour.m_blue &&
-              m_isInit == colour.m_isInit);
+        return (m_red == colour.m_red &&
+                m_green == colour.m_green &&
+                m_blue == colour.m_blue &&
+                m_isInit == colour.m_isInit);
     }
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
-    void InitFromName(const wxString& colourName);
 
 protected:
 
     // Helper function
     void Init();
 
+    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue);
+
 private:
     bool m_isInit;
     unsigned char m_red;