fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

diff --git a/include/wx/os2/colour.h b/include/wx/os2/colour.h
index f8d69fa6e2caf187f6ff2a92ec86dc1559cde104..7b92b0db031e3ea46e9362ddbc9426305fca55e0 100644 (file)
--- a/include/wx/os2/colour.h
+++ b/include/wx/os2/colour.h
@@ -20,9 +20,6 @@ class WXDLLEXPORT wxColour: public wxColourBase
 public:
     // constructors
     // ------------
-
-    // default
-    wxColour();
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // Copy ctors and assignment operators
@@ -34,7 +31,7 @@ public:
     virtual ~wxColour();
 
     // Accessors
-    bool Ok(void) const {return m_bIsInit; }
+    virtual 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 +62,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 ;