Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac cgcolor changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-11-22 17:45:58 +00:00
parent bf7bd4b185
commit efb190955c
1 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/wx/mac/carbon/colour.h
View File

@@ -15,6 +15,8 @@
#include "wx/object.h" #include "wx/object.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/mac/corefoundation/cfref.h"
struct RGBColor; struct RGBColor;
// Colour // Colour
@@ -25,7 +27,7 @@ public:
// ------------ // ------------
// default // default
wxColour() { Init(); } wxColour() { }
DEFINE_STD_WXCOLOUR_CONSTRUCTORS DEFINE_STD_WXCOLOUR_CONSTRUCTORS
// dtor // dtor
@@ -35,49 +37,41 @@ public:
bool Ok() const { return IsOk(); } bool Ok() const { return IsOk(); }
bool IsOk() const; bool IsOk() const;
unsigned char Red() const { return m_red; } ChannelType Red() const { return m_red; }
unsigned char Green() const { return m_green; } ChannelType Green() const { return m_green; }
unsigned char Blue() const { return m_blue; } ChannelType Blue() const { return m_blue; }
unsigned char Alpha() const { return m_alpha; } ChannelType Alpha() const { return m_alpha; }
// comparison // comparison
bool operator == (const wxColour& colour) const bool operator == (const wxColour& colour) const;
{
return (m_isInit == colour.m_isInit
&& m_red == colour.m_red
&& m_green == colour.m_green
&& m_blue == colour.m_blue
&& m_alpha == colour.m_alpha);
}
bool operator != (const wxColour& colour) const { return !(*this == colour); } bool operator != (const wxColour& colour) const { return !(*this == colour); }
const WXCOLORREF& GetPixel() const { return m_pixel; }; CGColorRef GetPixel() const { return m_cgColour; };
void GetRGBColor( RGBColor *col ) const;
// Mac-specific ctor and assignment operator from the native colour // Mac-specific ctor and assignment operator from the native colour
// assumes ownership of CGColorRef
wxColour( CGColorRef col );
wxColour(const RGBColor& col); wxColour(const RGBColor& col);
wxColour& operator=(const RGBColor& col); wxColour& operator=(const RGBColor& col);
wxColour& operator=(CGColorRef col);
protected : protected :
// Helper function
void Init();
virtual void virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);
void InitRGBColor( const RGBColor& col );
void InitCGColorRef( CGColorRef col );
private: private:
bool m_isInit; wxCFRef<CGColorRef> m_cgColour;
unsigned char m_red;
unsigned char m_blue;
unsigned char m_green;
unsigned char m_alpha;
public: ChannelType m_red;
WXCOLORREF m_pixel ; ChannelType m_blue;
void FromRGBColor( WXCOLORREF* color ) ; ChannelType m_green;
ChannelType m_alpha;
private:
DECLARE_DYNAMIC_CLASS(wxColour) DECLARE_DYNAMIC_CLASS(wxColour)
}; };