From e0dd66614441d756c9a8332153a9da547d3ce72c Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 31 Jul 2008 10:21:17 +0000 Subject: [PATCH] wxColour is implemented using CoreGraphics git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/carbon/colour.h | 83 ---------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 include/wx/osx/carbon/colour.h diff --git a/include/wx/osx/carbon/colour.h b/include/wx/osx/carbon/colour.h deleted file mode 100644 index c24aedc939..0000000000 --- a/include/wx/osx/carbon/colour.h +++ /dev/null @@ -1,83 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/colour.h -// Purpose: wxColour class -// Author: Stefan Csomor -// Modified by: -// Created: 1998-01-01 -// RCS-ID: $Id$ -// Copyright: (c) Stefan Csomor -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLOUR_H_ -#define _WX_COLOUR_H_ - -#include "wx/object.h" -#include "wx/string.h" - -#include "wx/osx/core/cfref.h" - -struct RGBColor; - -// Colour -class WXDLLIMPEXP_CORE wxColour: public wxColourBase -{ -public: - // constructors - // ------------ - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - - // default copy ctor and dtor are ok - - // accessors - virtual bool IsOk() const { return m_cgColour; } - - ChannelType Red() const { return m_red; } - ChannelType Green() const { return m_green; } - ChannelType Blue() const { return m_blue; } - ChannelType Alpha() const { return m_alpha; } - - // comparison - bool operator == (const wxColour& colour) const; - - bool operator != (const wxColour& colour) const { return !(*this == colour); } - - CGColorRef GetPixel() const { return m_cgColour; }; - - CGColorRef GetCGColor() const { return m_cgColour; }; - CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }; - -#if wxOSX_USE_CARBON - 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 - 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); -#if wxOSX_USE_CARBON - void InitRGBColor( const RGBColor& col ); -#endif - void InitCGColorRef( CGColorRef col ); -private: - wxCFRef m_cgColour; - - ChannelType m_red; - ChannelType m_blue; - ChannelType m_green; - ChannelType m_alpha; - - DECLARE_DYNAMIC_CLASS(wxColour) -}; - -#endif - // _WX_COLOUR_H_ -- 2.45.2