Beginning of wxDataViewTreeStore API

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

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index f8d69fa6e2caf187f6ff2a92ec86dc1559cde104..f0538eab36e6d8025ddd9e9eceb49982d3c390cb 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -34,7 +34,8 @@ public:
     virtual ~wxColour();
 
     // Accessors
     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; }
 
     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;
 
     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 ;
 
 public:
     WXCOLORREF                      m_vPixel ;