streamlining slider, scroller, spinbutton for osx carbon and cocoa

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

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index 66aa3800d4c483e3e6beb94fe99e6addf9ae6ac2..edaf6a19e3ce83e154d9802448e4ee25234d5945 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -15,25 +15,23 @@
 #include "wx/object.h"
 
 // Colour
-class WXDLLEXPORT wxColour: public wxColourBase
+class WXDLLIMPEXP_CORE wxColour: public wxColourBase
 {
 public:
     // constructors
     // ------------
-
-    // default
-    wxColour();
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // copy ctors and assignment operators
-    wxColour(const wxColour& col);
-    wxColour& operator=(const wxColour& col);
+    wxColour(const wxColour& col)
+    {
+        *this = col;
+    }
 
-    // dtor
-    virtual ~wxColour();
+    wxColour& operator=(const wxColour& col);
 
     // accessors
-    bool Ok() const { return m_isInit; }
+    virtual bool IsOk() const { return m_isInit; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
@@ -57,12 +55,8 @@ protected:
     // Helper function
     void Init();
 
-    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue)
-    {
-        InitWith(red, green, blue, wxALPHA_OPAQUE);
-    }
-
-    virtual void InitWith(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha);
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
 private:
     bool m_isInit;