From c0ac1c32a461f96444c67940a5d970a2c740071a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 20 Oct 1998 02:10:29 +0000 Subject: [PATCH] commented out constructor causing ambiguity git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/colour.h | 10 +++++----- include/wx/gtk1/colour.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 26f30c60c4..43f9d52839 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -44,7 +44,7 @@ class wxColour: public wxGDIObject wxColour(); wxColour( char red, char green, char blue ); wxColour( const wxString &colourName ) { InitFromName(colourName); } - wxColour( const char *colourName ) { InitFromName(colourName); } +// wxColour( const char *colourName ) { InitFromName(colourName); } wxColour( const wxColour& col ); wxColour( const wxColour* col ); ~wxColour(); @@ -60,16 +60,16 @@ class wxColour: public wxGDIObject private: public: - + friend wxDC; friend wxPaintDC; friend wxBitmap; friend wxWindow; - + void CalcPixel( GdkColormap *cmap ); int GetPixel() const; GdkColor *GetColor() const; - + protected: // helper functions void InitFromName(const wxString& colourName); @@ -77,5 +77,5 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxColour) }; - + #endif // __GTKCOLOURH__ diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h index 26f30c60c4..43f9d52839 100644 --- a/include/wx/gtk1/colour.h +++ b/include/wx/gtk1/colour.h @@ -44,7 +44,7 @@ class wxColour: public wxGDIObject wxColour(); wxColour( char red, char green, char blue ); wxColour( const wxString &colourName ) { InitFromName(colourName); } - wxColour( const char *colourName ) { InitFromName(colourName); } +// wxColour( const char *colourName ) { InitFromName(colourName); } wxColour( const wxColour& col ); wxColour( const wxColour* col ); ~wxColour(); @@ -60,16 +60,16 @@ class wxColour: public wxGDIObject private: public: - + friend wxDC; friend wxPaintDC; friend wxBitmap; friend wxWindow; - + void CalcPixel( GdkColormap *cmap ); int GetPixel() const; GdkColor *GetColor() const; - + protected: // helper functions void InitFromName(const wxString& colourName); @@ -77,5 +77,5 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxColour) }; - + #endif // __GTKCOLOURH__ -- 2.47.2