clear m_aTypes array in Clear() as well (patch 1165866)

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

diff --git a/include/wx/mgl/colour.h b/include/wx/mgl/colour.h
index 4050f37c2a31caf860df7df3f337fb893aaef43b..ac3c8e2a162b6c283138f4bc7844559d74372c1d 100644 (file)
--- a/include/wx/mgl/colour.h
+++ b/include/wx/mgl/colour.h
@@ -25,7 +25,8 @@ public:
       // default
     wxColour();
       // from RGB
       // default
     wxColour();
       // from RGB

-    wxColour(unsigned char red, unsigned char green, unsigned char blue);
+    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(unsigned long colRGB) { Set(colRGB); }
 
       // implicit conversion from the colour name


@@ -54,11 +55,6 @@ public:
     // accessors
     bool Ok() const { return m_isInit; }
 
     // accessors
     bool Ok() const { return m_isInit; }
 

-    // Let's remove this inelegant function
-#if WXWIN_COMPATIBILITY
-    void Get(unsigned char *r, unsigned char *g, unsigned char *b) const;
-#endif
-

     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
     unsigned char Blue() const { return m_blue; }


@@ -73,15 +69,19 @@ public:
     }
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
     }
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 

+    void InitFromName(const wxString& colourName);
+
+protected:
+
+    // Helper function
+    void Init();
+

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

-    // helper func
-    void InitFromName(const wxString& colourName);
-

 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };