From e0a09ce41962009495be1f25c6c9f5e5ec11be18 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 20 Oct 1998 02:11:12 +0000 Subject: [PATCH] Commented out constructor causing ambiguity git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/colour.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index a97b2b7c64..b8f2270a4d 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -25,7 +25,7 @@ public: wxColour(unsigned long colRGB) { Set(colRGB); } wxColour(const wxColour& col); wxColour(const wxString& col) { InitFromName(col); } - wxColour(const char *col) { InitFromName(col); } +// wxColour(const char *col) { InitFromName(col); } ~wxColour(); wxColour& operator =(const wxColour& src) ; @@ -33,13 +33,13 @@ public: inline int Ok() const { return (m_isInit) ; } 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 // 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 >> 16)); + (unsigned char)(colRGB >> 16)); } // Let's remove this inelegant function -- 2.45.2