X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/401eb3dec29c09b9afcc843842cba48b33a5089b..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk1/colour.h diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h index f07bce2d9d..de243d30a7 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 @@ -47,7 +47,7 @@ public: // Implicit conversion from the colour name wxColour( const wxString &colourName ) { InitFromName(colourName); } - wxColour( const char *colourName ) { InitFromName(colourName); } + wxColour( const char *colourName ) { InitFromName( wxString::FromAscii(colourName) ); } #if wxUSE_UNICODE wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); } #endif