RGBColor on QD only

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/colour.h b/include/wx/mac/carbon/colour.h
index 431149f06060fa5554665cadb19a263608323b33..9b1d6129d579f27803e08c9a673c5f1d5cce1aab 100644 (file)
--- a/include/wx/mac/carbon/colour.h
+++ b/include/wx/mac/carbon/colour.h
@@ -47,20 +47,26 @@ 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 wxMAC_USE_QUICKDRAW

     void GetRGBColor( RGBColor *col ) const;
     void GetRGBColor( RGBColor *col ) const;

+#endif

 
     // Mac-specific ctor and assignment operator from the native colour
     // assumes ownership of CGColorRef
     wxColour( CGColorRef col );
 
     // Mac-specific ctor and assignment operator from the native colour
     // assumes ownership of CGColorRef
     wxColour( CGColorRef col );

+#if wxMAC_USE_QUICKDRAW

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

+#endif

     wxColour& operator=(CGColorRef col);
     wxColour& operator=(const wxColour& col);
 
 protected :
     virtual void
     InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);
     wxColour& operator=(CGColorRef col);
     wxColour& operator=(const wxColour& col);
 
 protected :
     virtual void
     InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);

+#if wxMAC_USE_QUICKDRAW

     void InitRGBColor( const RGBColor& col );
     void InitRGBColor( const RGBColor& col );

+#endif

     void InitCGColorRef( CGColorRef col );
 private:
     wxCFRef<CGColorRef>     m_cgColour;
     void InitCGColorRef( CGColorRef col );
 private:
     wxCFRef<CGColorRef>     m_cgColour;