Fix VC6 compilation by changing the order of assignment operators in wxAny

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

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index 889a8ef798de35e833b743dcfd3fd9a3fea4aa3c..e1d44c1c83e122224c8e9cba7c4210b8f3ce61e0 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colour.h
+// Name:        wx/os2/colour.h
 // Purpose:     wxColour class
 // Author:      David Webster
 // Modified by:
@@ -15,81 +15,29 @@
 #include "wx/object.h"
 
 // Colour
-class WXDLLEXPORT wxColour: public wxObject
+class WXDLLIMPEXP_CORE wxColour: public wxColourBase
 {
 public:
-    //
-    // Ctors
-    //
-
-    //
-    // Default
-    //
-    wxColour();
-
-    //
-    // from RGB
-    //
-    wxColour( unsigned char cRed
-             ,unsigned char cGreen
-             ,unsigned char cBlue
-            );
-
-    wxColour( unsigned long colRGB ) { Set(colRGB); }
-
-    //
-    // Implicit conversion from the colour name
-    //
-    wxColour(const wxString& rColourName) { InitFromName(rColourName); }
-    wxColour(const wxChar *zColourName) { InitFromName(zColourName); }
-
-    //
+    // constructors
+    // ------------
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
+
     // Copy ctors and assignment operators
-    //
     wxColour(const wxColour& rCol);
     wxColour(const wxColour* pCol);
     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; }
     unsigned char Blue(void) const { return m_cBlue; }
 
-    //
     // Comparison
-    //
     bool operator == (const wxColour& rColour) const
     {
         return (m_bIsInit == rColour.m_bIsInit
@@ -103,22 +51,24 @@ 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 ;
 private:
-  DECLARE_DYNAMIC_CLASS(wxColour)
+    DECLARE_DYNAMIC_CLASS(wxColour)
 }; // end of class wxColour
 
 #endif