no changes, just remove #if'd out code

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

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index d553f762bc72a9888b080f3826bfaa3110201cfc..3209d94f0c55224db144d640a13f7d16477bf8c8 100644 (file)
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -19,30 +19,16 @@
 // wxColour
 // ========================================================================
 
 // wxColour
 // ========================================================================
 

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

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

-
-    // default
-    wxColour() { Init(); }
-
-    // the other standard ones: notice that we can't use
-    // DEFINE_STD_WXCOLOUR_CONSTRUCTORS here because we need to call Init() to
-    // initialize m_cocoaNSColor and the macro doesn't do it
-    wxColour( ChannelType red, ChannelType green, ChannelType blue,
-              ChannelType alpha = wxALPHA_OPAQUE )
-        { Init(); Set(red, green, blue, alpha); }
-    wxColour(unsigned long colRGB) { Init(); Set(colRGB); }
-    wxColour(const wxString& colourName) { Init(); Set(colourName); }
-    wxColour(const char *colourName) { Init(); Set(colourName); }
-    wxColour(const wchar_t *colourName) { Init(); Set(colourName); }
+    DEFINE_STD_WXCOLOUR_CONSTRUCTORS

 
     // initialization using existing NSColor
     wxColour( WX_NSColor aColor );
 
 
     // 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 );


@@ -50,9 +36,9 @@ public:
     virtual ~wxColour();
 
     // accessors
     virtual ~wxColour();
 
     // accessors

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

     WX_NSColor GetNSColor() { return m_cocoaNSColor; }
     WX_NSColor GetNSColor() { return m_cocoaNSColor; }

+    WX_NSColor GetNSColor() const { return m_cocoaNSColor; }

 
     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; }