added labels support for toolbar controls for wxMac and wxMSW (modified patch 1613603)

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

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index 807d673645cf184b91ddc7389524ce52e2063555..f0538eab36e6d8025ddd9e9eceb49982d3c390cb 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -22,7 +22,7 @@ public:
     // ------------
 
     // default
-    wxColour() { Init(); }
+    wxColour();
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // Copy ctors and assignment operators
@@ -31,10 +31,11 @@ public:
     wxColour&operator = (const wxColour& rCol);
 
     // Dtor
-    ~wxColour();
+    virtual ~wxColour();
 
     // Accessors
-    bool Ok(void) const {return m_bIsInit; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk(void) const {return m_bIsInit; }
 
     unsigned char Red(void) const { return m_cRed; }
     unsigned char Green(void) const { return m_cGreen; }
@@ -65,7 +66,8 @@ private:
     unsigned char  m_cBlue;
     unsigned char  m_cGreen;
 
-    virtual void InitWith( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
+    virtual void
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
 public:
     WXCOLORREF                      m_vPixel ;