Fix warnings in the MSW IE backend.

[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 c24aedc939210ee5496ebee92317319559df51c1..f5357bcb709a77df2bb006d88224e96a98a3ce78 100644 (file)
--- a/include/wx/osx/core/colour.h
+++ b/include/wx/osx/core/colour.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/colour.h
+// Name:        wx/osx/core/colour.h

 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:


@@ -30,12 +30,12 @@ public:
     // default copy ctor and dtor are ok
 
     // accessors
     // 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;
 
     // comparison
     bool operator == (const wxColour& colour) const;


@@ -47,16 +47,20 @@ public:
     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 ); };
 

-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON

     void GetRGBColor( RGBColor *col ) const;
 #endif
 
     // Mac-specific ctor and assignment operator from the native colour
     // assumes ownership of CGColorRef
     wxColour( CGColorRef col );
     void GetRGBColor( RGBColor *col ) const;
 #endif
 
     // Mac-specific ctor and assignment operator from the native colour
     // assumes ownership of CGColorRef
     wxColour( CGColorRef col );

-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON

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

+#endif
+#if wxOSX_USE_COCOA
+    wxColour(WX_NSColor color);
+    WX_NSColor OSXGetNSColor() const;

 #endif
     wxColour& operator=(CGColorRef col);
     wxColour& operator=(const wxColour& col);
 #endif
     wxColour& operator=(CGColorRef col);
     wxColour& operator=(const wxColour& col);


@@ -64,10 +68,11 @@ public:
 protected :
     virtual void
     InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);
 protected :
     virtual void
     InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);

-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON

     void InitRGBColor( const RGBColor& col );
 #endif
     void InitCGColorRef( CGColorRef col );
     void InitRGBColor( const RGBColor& col );
 #endif
     void InitCGColorRef( CGColorRef col );

+    void InitFromComponents(const CGFloat* components, size_t numComponents );

 private:
     wxCFRef<CGColorRef>     m_cgColour;
 
 private:
     wxCFRef<CGColorRef>     m_cgColour;