Another Unicode fix.

[wxWidgets.git] / src / gtk / colour.cpp

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 88a76bba564dc470c4a8969acfa77d8bbc0b9a47..9c9eef687d3002f2fa1a10367cddfcff6a03d8c2 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -89,10 +89,10 @@ void wxColour::InitFromName( const wxString &colourName )
     else
     {
         m_refData = new wxColourRefData();
     else
     {
         m_refData = new wxColourRefData();

-        if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
+        if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))

         {
         {

-            wxFAIL_MSG( "wxColour: couldn't find colour" );
-           printf( "Colourname %s.\n", WXSTRINGCAST colourName );
+            wxFAIL_MSG( _T("wxColour: couldn't find colour") );
+           wxPrintf( _T("Colourname %s.\n"), WXSTRINGCAST colourName );

       
             delete m_refData;
             m_refData = (wxObjectRefData *) NULL;
       
             delete m_refData;
             m_refData = (wxObjectRefData *) NULL;


@@ -116,12 +116,12 @@ wxColour& wxColour::operator = ( const wxColour& col )
     return *this;
 }
 
     return *this;
 }
 

-bool wxColour::operator == ( const wxColour& col )
+bool wxColour::operator == ( const wxColour& col ) const

 {
     return m_refData == col.m_refData;
 }
 
 {
     return m_refData == col.m_refData;
 }
 

-bool wxColour::operator != ( const wxColour& col)
+bool wxColour::operator != ( const wxColour& col) const

 {
     return m_refData != col.m_refData;
 }
 {
     return m_refData != col.m_refData;
 }


@@ -138,21 +138,21 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 
 unsigned char wxColour::Red() const
 {
 
 unsigned char wxColour::Red() const
 {

-    wxCHECK_MSG( Ok(), 0, "invalid colour" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid colour") );

 
     return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
 }
 
 unsigned char wxColour::Green() const
 {
 
     return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
 }
 
 unsigned char wxColour::Green() const
 {

-    wxCHECK_MSG( Ok(), 0, "invalid colour" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid colour") );

 
     return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
 }
 
 unsigned char wxColour::Blue() const
 {
 
     return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
 }
 
 unsigned char wxColour::Blue() const
 {

-    wxCHECK_MSG( Ok(), 0, "invalid colour" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid colour") );

 
     return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }
 
     return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }


@@ -200,14 +200,14 @@ void wxColour::CalcPixel( GdkColormap *cmap )
 
 int wxColour::GetPixel() const
 {
 
 int wxColour::GetPixel() const
 {

-    wxCHECK_MSG( Ok(), 0, "invalid colour" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid colour") );

 
     return M_COLDATA->m_color.pixel;
 }
 
 GdkColor *wxColour::GetColor() const
 {
 
     return M_COLDATA->m_color.pixel;
 }
 
 GdkColor *wxColour::GetColor() const
 {

-    wxCHECK_MSG( Ok(), (GdkColor *) NULL, "invalid colour" );
+    wxCHECK_MSG( Ok(), (GdkColor *) NULL, _T("invalid colour") );

 
     return &M_COLDATA->m_color;
 }
 
     return &M_COLDATA->m_color;
 }