AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

commented out constructor causing ambiguity

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

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

@ -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__

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

@ -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__