allow wxRB_GROUP to be changed after creation (patch 1544686)

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 556a5b9621a2e75b3f3933cfbac898543fa47866..1a1460430517d12e1f69bf4a570d0044c54a5cc8 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -18,7 +18,7 @@
 // Colour
 // ----------------------------------------------------------------------------
 
 // Colour
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxColour : public wxObject
+class WXDLLEXPORT wxColour : public wxColourBase

 {
 public:
     // constructors
 {
 public:
     // constructors


@@ -26,44 +26,12 @@ public:
 
     // default
     wxColour() { Init(); }
 
     // default
     wxColour() { Init(); }

+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS

 
 

-    // 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); }
-
-
-    // copy ctors and assignment operators
-    wxColour(const wxColour& col);
-    wxColour& operator=( const wxColour& col);

 
     // dtor
 
     // dtor

-    ~wxColour();
-
+    virtual ~wxColour();

 
 

-    // other methods
-    // -------------
-
-    // to have the matching Create also for this class
-    void Create( unsigned char red, unsigned char green, unsigned char blue )
-    { Set(red, green, blue); }
-
-    // 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
     // ---------
 
     // accessors
     // ---------


@@ -87,7 +55,6 @@ public:
 
     WXCOLORREF GetPixel() const { return m_pixel; };
 
 
     WXCOLORREF GetPixel() const { return m_pixel; };
 

-    void InitFromName(const wxString& colourName);

 
 public:
     WXCOLORREF m_pixel;
 
 public:
     WXCOLORREF m_pixel;


@@ -96,6 +63,9 @@ protected:
     // Helper function
     void Init();
 
     // Helper function
     void Init();
 

+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+

 private:
     bool          m_isInit;
     unsigned char m_red;
 private:
     bool          m_isInit;
     unsigned char m_red;