Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

[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 156e22d81e5977cd81acef3b7fd944d335ac44c0..431149f06060fa5554665cadb19a263608323b33 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -20,22 +20,17 @@
 struct RGBColor;
 
 // Colour
 struct RGBColor;
 
 // Colour

-class WXDLLEXPORT wxColour: public wxColourBase
+class WXDLLIMPEXP_CORE wxColour: public wxColourBase

 {
 public:
     // constructors
     // ------------
 {
 public:
     // constructors
     // ------------

-
-    // default
-    wxColour() { }

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 

-    // dtor
-    virtual ~wxColour();
+    // default copy ctor and dtor are ok

 
     // accessors
 
     // accessors

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

 
     ChannelType Red() const { return m_red; }
     ChannelType Green() const { return m_green; }
 
     ChannelType Red() const { return m_red; }
     ChannelType Green() const { return m_green; }


@@ -44,14 +39,14 @@ public:
 
     // comparison
     bool operator == (const wxColour& colour) const;
 
     // comparison
     bool operator == (const wxColour& colour) const;

-    
+

     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
     CGColorRef GetPixel() const { return m_cgColour; };
     bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
     CGColorRef GetPixel() const { return m_cgColour; };

-    
+

     CGColorRef GetCGColor() const { return m_cgColour; };
     CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); };
     CGColorRef GetCGColor() const { return m_cgColour; };
     CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); };

-    
+

     void GetRGBColor( RGBColor *col ) const;
 
     // Mac-specific ctor and assignment operator from the native colour
     void GetRGBColor( RGBColor *col ) const;
 
     // Mac-specific ctor and assignment operator from the native colour


@@ -60,10 +55,9 @@ public:
     wxColour(const RGBColor& col);
     wxColour& operator=(const RGBColor& col);
     wxColour& operator=(CGColorRef col);
     wxColour(const RGBColor& col);
     wxColour& operator=(const RGBColor& col);
     wxColour& operator=(CGColorRef col);

+    wxColour& operator=(const wxColour& col);

 
 protected :
 
 protected :

-
-

     virtual void
     InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);
     void InitRGBColor( const RGBColor& col );
     virtual void
     InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);
     void InitRGBColor( const RGBColor& col );