tell user to define _USE_OLD_RW_STL for BC5.6 instead of refusing to compile with...

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

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index cfdcd373f3d350f48eb82f53d4efd4adf75ed882..b2bc5796f19eee8d79135930387b4ef4ffb84dd6 100644 (file)
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -24,15 +24,11 @@ class WXDLLEXPORT wxColour : public wxColourBase
 public:
     // constructors
     // ------------
 public:
     // constructors
     // ------------

-
-    // default
-    wxColour() { Init(); }

     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // initialization using existing NSColor
     wxColour( WX_NSColor aColor );
 
     DEFINE_STD_WXCOLOUR_CONSTRUCTORS
 
     // initialization using existing NSColor
     wxColour( WX_NSColor aColor );
 

-

     // copy ctors and assignment operators
     wxColour( const wxColour& col );
     wxColour& operator = ( const wxColour& col );
     // copy ctors and assignment operators
     wxColour( const wxColour& col );
     wxColour& operator = ( const wxColour& col );


@@ -40,7 +36,7 @@ public:
     virtual ~wxColour();
 
     // accessors
     virtual ~wxColour();
 
     // accessors

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

     WX_NSColor GetNSColor() { return m_cocoaNSColor; }
 
     unsigned char Red() const { return m_red; }
     WX_NSColor GetNSColor() { return m_cocoaNSColor; }
 
     unsigned char Red() const { return m_red; }


@@ -70,9 +66,6 @@ public:
              unsigned char alpha = wxALPHA_OPAQUE)
         { wxColourBase::Set(red, green, blue, alpha); }
 
              unsigned char alpha = wxALPHA_OPAQUE)
         { wxColourBase::Set(red, green, blue, alpha); }
 

-    bool Set(const wxChar *str)
-        { return wxColourBase::Set(str); }
-

     bool Set(const wxString &str)
         { return wxColourBase::Set(str); }
 
     bool Set(const wxString &str)
         { return wxColourBase::Set(str); }