Committing in .

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index db73e73343bdda0d1bd65d9a52ea15ff0357e462..60e62c4b3a50aa738c2916584737380e0220d210 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -15,6 +15,7 @@
 #include "wx/gdicmn.h"
 
 #include <gdk/gdk.h>
 #include "wx/gdicmn.h"
 
 #include <gdk/gdk.h>

+#include <gdk/gdkx.h>

 #include <gdk/gdkprivate.h>
 
 //-----------------------------------------------------------------------------
 #include <gdk/gdkprivate.h>
 
 //-----------------------------------------------------------------------------


@@ -33,7 +34,7 @@ class wxColourRefData: public wxObjectRefData
     GdkColormap *m_colormap;
     bool         m_hasPixel;
 
     GdkColormap *m_colormap;
     bool         m_hasPixel;
 

-    friend wxColour;
+    friend class wxColour;

 };
 
 wxColourRefData::wxColourRefData()
 };
 
 wxColourRefData::wxColourRefData()


@@ -133,7 +134,7 @@ bool wxColour::operator == ( const wxColour& col ) const
 
 bool wxColour::operator != ( const wxColour& col) const
 {
 
 bool wxColour::operator != ( const wxColour& col) const
 {

-    return m_refData != col.m_refData;
+    return !(*this == col);

 }
 
 void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 }
 
 void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )


@@ -180,9 +181,14 @@ void wxColour::CalcPixel( GdkColormap *cmap )
     
     M_COLDATA->FreeColour();
 
     
     M_COLDATA->FreeColour();
 

+#ifdef __WXGTK20__
+    if ((cmap->visual->type == GDK_VISUAL_GRAYSCALE) ||
+        (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
+#else

     GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
     if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
         (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
     GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
     if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
         (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))

+#endif

     {
         GdkColor *colors = cmap->colors;
         int max = 3 * (65536);
     {
         GdkColor *colors = cmap->colors;
         int max = 3 * (65536);