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

17
include/wx/os2/colour.h
View File

@@ -41,7 +41,7 @@ public:
// Implicit conversion from the colour name
//
wxColour(const wxString& rColourName) { InitFromName(rColourName); }
wxColour(const char* zColourName) { InitFromName(zColourName); }
wxColour(const wxChar *zColourName) { InitFromName(zColourName); }
//
// Copy ctors and assignment operators
@@ -92,17 +92,24 @@ public:
//
bool operator == (const wxColour& rColour) const
{
return (m_cRed == rColour.m_cRed &&
m_cGreen == rColour.m_cGreen &&
m_cBlue == rColour.m_cBlue
return (m_isInit == rColour.m_isInit
&& m_cRed == rColour.m_cRed
&& m_cGreen == rColour.m_cGreen
&& m_cBlue == rColour.m_cBlue
);
}
bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
void InitFromName(const wxString& rCol);
WXCOLORREF GetPixel(void) const { return m_vPixel; };
void InitFromName(const wxString& rCol);
private:
// Helper function
void Init();
bool m_bIsInit;
unsigned char m_cRed;
unsigned char m_cBlue;