X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/gtk1/colour.cpp diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index ac8a7022dd..a4ca937116 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -91,8 +91,8 @@ void wxColour::InitFromName( const wxString &colourName ) m_refData = new wxColourRefData(); if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color )) { - wxFAIL_MSG( T("wxColour: couldn't find colour") ); - wxPrintf( T("Colourname %s.\n"), WXSTRINGCAST colourName ); + wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); + wxPrintf( wxT("Colourname %s.\n"), WXSTRINGCAST colourName ); delete m_refData; m_refData = (wxObjectRefData *) NULL; @@ -149,21 +149,21 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) unsigned char wxColour::Red() const { - wxCHECK_MSG( Ok(), 0, T("invalid colour") ); + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); } unsigned char wxColour::Green() const { - wxCHECK_MSG( Ok(), 0, T("invalid colour") ); + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); } unsigned char wxColour::Blue() const { - wxCHECK_MSG( Ok(), 0, T("invalid colour") ); + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); } @@ -211,14 +211,14 @@ void wxColour::CalcPixel( GdkColormap *cmap ) int wxColour::GetPixel() const { - wxCHECK_MSG( Ok(), 0, T("invalid colour") ); + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); return M_COLDATA->m_color.pixel; } GdkColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), (GdkColor *) NULL, T("invalid colour") ); + wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") ); return &M_COLDATA->m_color; }