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

Commented out constructor causing ambiguity

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-10-20 02:11:12 +00:00
parent c0ac1c32a4
commit e0a09ce419
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/msw/colour.h
View File

@@ -25,7 +25,7 @@ public:
wxColour(unsigned long colRGB) { Set(colRGB); } wxColour(unsigned long colRGB) { Set(colRGB); }
wxColour(const wxColour& col); wxColour(const wxColour& col);
wxColour(const wxString& col) { InitFromName(col); } wxColour(const wxString& col) { InitFromName(col); }
wxColour(const char *col) { InitFromName(col); } // wxColour(const char *col) { InitFromName(col); }
~wxColour(); ~wxColour();
wxColour& operator =(const wxColour& src) ; wxColour& operator =(const wxColour& src) ;
@@ -33,13 +33,13 @@ public:
inline int Ok() const { return (m_isInit) ; } inline int Ok() const { return (m_isInit) ; }
void Set(unsigned char r, unsigned char g, unsigned char b); void Set(unsigned char r, unsigned char g, unsigned char b);
void Set(unsigned long colRGB) void Set(unsigned long colRGB)
{ {
// we don't need to know sizeof(long) here because we assume that the three // we don't need to know sizeof(long) here because we assume that the three
// least significant bytes contain the R, G and B values // least significant bytes contain the R, G and B values
Set((unsigned char)colRGB, Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8), (unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16)); (unsigned char)(colRGB >> 16));
} }
// Let's remove this inelegant function // Let's remove this inelegant function