X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..69429a166f8b168228bbb89eb8c52903670f4fd2:/include/wx/gtk1/colour.h diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h index e399d074b2..f299ca5949 100644 --- a/include/wx/gtk1/colour.h +++ b/include/wx/gtk1/colour.h @@ -11,7 +11,7 @@ #ifndef __GTKCOLOURH__ #define __GTKCOLOURH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -48,6 +48,10 @@ public: // Implicit conversion from the colour name wxColour( const wxString &colourName ) { InitFromName(colourName); } wxColour( const char *colourName ) { InitFromName(colourName); } +#if wxUSE_UNICODE + wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); } +#endif + wxColour( const wxColour& col ) : wxGDIObject()