fixed compilation if wxUSE_STL=1

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

diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h
index a5707e3039b852eba0842dfaac60d9b0b96f61ab..28627daa0a0c372aea30da30f8a5a394c6a3fadb 100644 (file)
--- a/include/wx/generic/colour.h
+++ b/include/wx/generic/colour.h
@@ -30,10 +30,11 @@ public:
     wxColour& operator=(const wxColour& col);
 
     // dtor
     wxColour& operator=(const wxColour& col);
 
     // dtor

-    ~wxColour();
+    virtual ~wxColour();

 
     // accessors
 
     // accessors

-    bool Ok() const { return m_isInit; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_isInit; }

 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }


@@ -57,12 +58,8 @@ protected:
     // Helper function
     void Init();
 
     // 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;
 
 private:
     bool m_isInit;