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

added alpha support to wxCocoa, also fixed compilation after alpha changes hopefully

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-08-28 09:53:33 +00:00
parent df00bdf773
commit 7106497983
2 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
include/wx/cocoa/colour.h
View File

@@ -46,47 +46,54 @@ public:
unsigned char Red() const { return m_red; }
unsigned char Green() const { return m_green; }
unsigned char Blue() const { return m_blue; }
unsigned char Alpha() const { return m_alpha; }
// comparison
bool operator == (const wxColour& colour) const
{
// TODO: Really compare the NSColor
return (m_cocoaNSColor == colour.m_cocoaNSColor
|| (m_red == colour.m_red
&& m_green == colour.m_green
&& m_blue == colour.m_blue));
return m_cocoaNSColor == colour.m_cocoaNSColor ||
(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); }
{ return !(*this == colour); }
// Set() functions
void Set( WX_NSColor aColor );
// reroute the inherited ones
void Set(unsigned char red, unsigned char green, unsigned char blue)
{ wxColourBase::Set(red,green,blue); }
// implemented in colourcmn.cpp
void Set(unsigned char red,
unsigned char green,
unsigned char blue,
unsigned char alpha = wxALPHA_OPAQUE)
{ wxColourBase::Set(red, green, blue, alpha); }
bool Set(const wxChar *str)
{ return wxColourBase::Set(str); }
{ return wxColourBase::Set(str); }
bool Set(const wxString &str)
{ return wxColourBase::Set(str); }
{ return wxColourBase::Set(str); }
void Set(unsigned long colRGB)
{ wxColourBase::Set(colRGB); }
{ wxColourBase::Set(colRGB); }
protected:
// puts the object in an invalid, uninitialized state
void Init();
virtual void InitWith( unsigned char red, unsigned char green, unsigned char blue );
virtual void InitWith(unsigned char red,
unsigned char green,
unsigned char blue,
unsigned char alpha);
private:
WX_NSColor m_cocoaNSColor;
unsigned char m_red;
unsigned char m_green;
unsigned char m_blue;
unsigned char m_alpha;
DECLARE_DYNAMIC_CLASS(wxColour)
};