Fixed a bug which sometimes lead to windows

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 74e414ef03c5984e1e465c38e1f861853ce4fdbc..9c9eef687d3002f2fa1a10367cddfcff6a03d8c2 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -14,6 +14,7 @@
 
 #include "wx/gdicmn.h"
 
 
 #include "wx/gdicmn.h"
 

+#include "gdk/gdk.h"

 #include "gdk/gdkprivate.h"
 
 //-----------------------------------------------------------------------------
 #include "gdk/gdkprivate.h"
 
 //-----------------------------------------------------------------------------


@@ -88,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;


@@ -115,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;
 }


@@ -137,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);
 }


@@ -166,28 +167,29 @@ void wxColour::CalcPixel( GdkColormap *cmap )
     if (!Ok()) return;
 
     if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
     if (!Ok()) return;
 
     if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;

+    

     M_COLDATA->FreeColour();
 
     M_COLDATA->FreeColour();
 

-  GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
-  if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
-      (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
-  {
-    GdkColor *colors = cmap->colors;
-    int max = 3 * (65536);
-    int index = -1;
-
-    for (int i = 0; i < cmap->size; i++)
+    GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
+    if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
+        (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))

     {
     {

-      int rdiff = (M_COLDATA->m_color.red - colors[i].red);
-      int gdiff = (M_COLDATA->m_color.green - colors[i].green);
-      int bdiff = (M_COLDATA->m_color.blue - colors[i].blue);
-      int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-      if (sum < max) { index = i; max = sum; }
-    }
+        GdkColor *colors = cmap->colors;
+        int max = 3 * (65536);
+        int index = -1;
+
+        for (int i = 0; i < cmap->size; i++)
+        {
+            int rdiff = (M_COLDATA->m_color.red - colors[i].red);
+            int gdiff = (M_COLDATA->m_color.green - colors[i].green);
+            int bdiff = (M_COLDATA->m_color.blue - colors[i].blue);
+            int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+            if (sum < max) { index = i; max = sum; }
+        }

 
 

-    M_COLDATA->m_hasPixel = TRUE;
-    M_COLDATA->m_color.pixel = index;
-  }
+        M_COLDATA->m_hasPixel = TRUE;
+        M_COLDATA->m_color.pixel = index;
+    }

     else
     { 
         M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
     else
     { 
         M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );


@@ -198,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;
 }