Changed all symbols with the name "id" to "timerid" to allow Objective-C++

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

diff --git a/include/wx/mgl/colour.h b/include/wx/mgl/colour.h
index 4050f37c2a31caf860df7df3f337fb893aaef43b..13531891078118e2dec5819aac79b0a37d90c304 100644 (file)
--- a/include/wx/mgl/colour.h
+++ b/include/wx/mgl/colour.h
@@ -25,7 +25,8 @@ public:
       // 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
@@ -54,11 +55,6 @@ public:
     // 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; }
@@ -79,7 +75,8 @@ private:
     unsigned char m_blue;
     unsigned char m_green;
 
-    // helper func
+    // ctors helpers
+    void Init();
     void InitFromName(const wxString& colourName);
 
 private: