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 81eccf5e5fa03c03a5546aa3d46fa4390c09794a..892509205e5e7108a2d008ecc8a54f4b905486d6 100644 (file)
--- a/include/wx/mgl/colour.h
+++ b/include/wx/mgl/colour.h
@@ -15,7 +15,7 @@
 #include "wx/object.h"
 
 // Colour
-class WXDLLEXPORT wxColour: public wxObject
+class WXDLLEXPORT wxColour: public wxColourBase
 {
 public:
     // constructors
@@ -23,18 +23,7 @@ public:
 
     // default
     wxColour();
-
-    // 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 char *colourName) { InitFromName(colourName); }
-
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
     wxColour(const wxColour& col);
@@ -43,17 +32,6 @@ public:
     // 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; }
 
@@ -71,13 +49,14 @@ public:
     }
     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;