commented out constructor causing ambiguity

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index 26f30c60c4c88e66e6fdd755ded579a6e1b5b4ae..43f9d528399f808cf3cd47e899866d6f0de509c1 100644 (file)
--- 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();
     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();
     wxColour( const wxColour& col );
     wxColour( const wxColour* col );
     ~wxColour();


@@ -60,16 +60,16 @@ class wxColour: public wxGDIObject
 
   private:
   public:
 
   private:
   public:

-  
+

     friend wxDC;
     friend wxPaintDC;
     friend wxBitmap;
     friend wxWindow;
     friend wxDC;
     friend wxPaintDC;
     friend wxBitmap;
     friend wxWindow;

-        
+

     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     GdkColor *GetColor() const;
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     GdkColor *GetColor() const;

-    
+

 protected:
     // helper functions
     void InitFromName(const wxString& colourName);
 protected:
     // helper functions
     void InitFromName(const wxString& colourName);


@@ -77,5 +77,5 @@ protected:
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };

-  
+

 #endif // __GTKCOLOURH__
 #endif // __GTKCOLOURH__

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 26f30c60c4c88e66e6fdd755ded579a6e1b5b4ae..43f9d528399f808cf3cd47e899866d6f0de509c1 100644 (file)
--- 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();
     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();
     wxColour( const wxColour& col );
     wxColour( const wxColour* col );
     ~wxColour();


@@ -60,16 +60,16 @@ class wxColour: public wxGDIObject
 
   private:
   public:
 
   private:
   public:

-  
+

     friend wxDC;
     friend wxPaintDC;
     friend wxBitmap;
     friend wxWindow;
     friend wxDC;
     friend wxPaintDC;
     friend wxBitmap;
     friend wxWindow;

-        
+

     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     GdkColor *GetColor() const;
     void CalcPixel( GdkColormap *cmap );
     int GetPixel() const;
     GdkColor *GetColor() const;

-    
+

 protected:
     // helper functions
     void InitFromName(const wxString& colourName);
 protected:
     // helper functions
     void InitFromName(const wxString& colourName);


@@ -77,5 +77,5 @@ protected:
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxColour)
 };

-  
+

 #endif // __GTKCOLOURH__
 #endif // __GTKCOLOURH__