X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..51a7e6af000633935cd5b327fa6a3b461dcacf4e:/include/wx/mac/colour.h diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h index d538f5f6a4..25b6d3b726 100644 --- a/include/wx/mac/colour.h +++ b/include/wx/mac/colour.h @@ -12,7 +12,7 @@ #ifndef _WX_COLOUR_H_ #define _WX_COLOUR_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "colour.h" #endif @@ -36,7 +36,7 @@ public: wxColour( const wxString &colourName ) : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0) { InitFromName(colourName); } - wxColour( const char *colourName ) + wxColour( const wxChar *colourName ) : m_isInit(FALSE), m_red(0), m_blue(0), m_green(0) { InitFromName(colourName); } @@ -62,11 +62,6 @@ public: // accessors bool Ok() const {return m_isInit; } - // Let's remove this inelegant function -#if WXWIN_COMPATIBILITY - void Get(unsigned char *r, unsigned char *g, unsigned char *b) const; -#endif - unsigned char Red() const { return m_red; } unsigned char Green() const { return m_green; } unsigned char Blue() const { return m_blue; }