Wine fixes

[wxWidgets.git] / include / wx / mac / carbon / colour.h

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index 2cad2126eeb06d9f6c1a08f0d9b0c281f15dec04..40535989035294e58f59167ba719a3de0b92d5c6 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -27,10 +27,11 @@ public:
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // dtor
-    ~wxColour();
+    virtual ~wxColour();
 
     // 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; }
@@ -55,12 +56,8 @@ protected :
     // Helper function
     void Init();
 
-    void InitWith( unsigned char red, unsigned char green, unsigned char blue ) 
-    {
-        InitWith( red, green, blue , wxALPHA_OPAQUE ) ;
-    }
-
-    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;
@@ -71,8 +68,8 @@ private:
 
 public:
     WXCOLORREF m_pixel ;
-    void FromRGBColor( const WXCOLORREF* color ) ;
-    
+    void FromRGBColor( WXCOLORREF* color ) ;
+
 
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)