X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6fcbb63d0a6ca455f2c81cd0fe42c4bb93b2b21..75737d0570103dbb9de120e77d0ce3154510ece9:/src/gtk/colour.cpp

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index a3292d450d..9c9eef687d 100644
--- 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();
-        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;
@@ -116,12 +116,12 @@ wxColour& wxColour::operator = ( const wxColour& col )
     return *this;
 }
 
-bool wxColour::operator == ( const wxColour& col )
+bool wxColour::operator == ( const wxColour& col ) const
 {
     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;
 }
@@ -138,21 +138,21 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 
 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
 {
-    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
 {
-    wxCHECK_MSG( Ok(), 0, "invalid colour" );
+    wxCHECK_MSG( Ok(), 0, _T("invalid colour") );
 
     return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }
@@ -167,6 +167,7 @@ void wxColour::CalcPixel( GdkColormap *cmap )
     if (!Ok()) return;
 
     if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
+    
     M_COLDATA->FreeColour();
 
     GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
@@ -199,14 +200,14 @@ void wxColour::CalcPixel( GdkColormap *cmap )
 
 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
 {
-    wxCHECK_MSG( Ok(), (GdkColor *) NULL, "invalid colour" );
+    wxCHECK_MSG( Ok(), (GdkColor *) NULL, _T("invalid colour") );
 
     return &M_COLDATA->m_color;
 }