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

Applied patch [ 828303 ] Slight wxColour cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-12-11 10:10:40 +00:00
parent 12ac619f42
commit aad6765cbd
23 changed files with 303 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ public:
wxColour( unsigned long colRGB )
: m_cocoaNSColor(NULL)
{ Set(colRGB); }
// implicit conversion from the colour name
wxColour( const wxString &colourName )
: m_cocoaNSColor(NULL)
@@ -62,10 +62,10 @@ public:
// comparison
bool operator == (const wxColour& colour) const
{
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);
}
bool operator != (const wxColour& colour) const
{ return !(*this == colour); }
@@ -83,7 +83,6 @@ public:
(unsigned char)(colRGB >> 16));
}
protected:
void InitFromName(const wxString& col);
private: