Restore correct access to wxGenericStaticText::Set{Font,Label}.

[wxWidgets.git] / include / wx / osx / core / colour.h

diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h
index 582d36ec3edabda074ed5d81cc2f39653a8075f7..bbc72012221ed50a852b686d29fbad63ce9c87b2 100644 (file)
--- a/include/wx/osx/core/colour.h
+++ b/include/wx/osx/core/colour.h
@@ -30,12 +30,12 @@ public:
     // default copy ctor and dtor are ok
 
     // accessors
-    virtual bool IsOk() const { return m_cgColour; }
+    virtual bool IsOk() const { return m_cgColour != NULL; }
 
-    ChannelType Red() const { return m_red; }
-    ChannelType Green() const { return m_green; }
-    ChannelType Blue() const { return m_blue; }
-    ChannelType Alpha() const { return m_alpha; }
+    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Red() const { return m_red; }
+    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Green() const { return m_green; }
+    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Blue() const { return m_blue; }
+    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Alpha() const { return m_alpha; }
 
     // comparison
     bool operator == (const wxColour& colour) const;
@@ -57,6 +57,10 @@ public:
 #if wxOSX_USE_COCOA_OR_CARBON
     wxColour(const RGBColor& col);
     wxColour& operator=(const RGBColor& col);
+#endif
+#if wxOSX_USE_COCOA
+    wxColour(WX_NSColor color);
+    WX_NSColor OSXGetNSColor();
 #endif
     wxColour& operator=(CGColorRef col);
     wxColour& operator=(const wxColour& col);
@@ -68,6 +72,7 @@ protected :
     void InitRGBColor( const RGBColor& col );
 #endif
     void InitCGColorRef( CGColorRef col );
+    void InitFromComponents(const CGFloat* components, size_t numComponents );
 private:
     wxCFRef<CGColorRef>     m_cgColour;