Commented out constructor causing ambiguity

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index a97b2b7c64425ff0acfc1f115361fe6e43c334c0..b8f2270a4d2eb2116d8d12738f363bd5e6e43f15 100644 (file)
--- 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(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) ;
   ~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);
   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
     // 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 >> 8),

-        (unsigned char)(colRGB >> 16)); 
+        (unsigned char)(colRGB >> 16));

   }
 
   // Let's remove this inelegant function
   }
 
   // Let's remove this inelegant function