Used GetCursorPos for new wxGetMousePosition implementation

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index a4ca937116ddc6940b844535ec12fc0b688c373e..60e62c4b3a50aa738c2916584737380e0220d210 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -14,8 +14,9 @@
 
 #include "wx/gdicmn.h"
 
-#include "gdk/gdk.h"
-#include "gdk/gdkprivate.h"
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
 
 //-----------------------------------------------------------------------------
 // wxColour
@@ -33,7 +34,7 @@ class wxColourRefData: public wxObjectRefData
     GdkColormap *m_colormap;
     bool         m_hasPixel;
 
-    friend wxColour;
+    friend class wxColour;
 };
 
 wxColourRefData::wxColourRefData()
@@ -92,7 +93,6 @@ void wxColour::InitFromName( const wxString &colourName )
         if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
         {
             wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
-           wxPrintf( wxT("Colourname %s.\n"), WXSTRINGCAST colourName );
       
             delete m_refData;
             m_refData = (wxObjectRefData *) NULL;
@@ -134,7 +134,7 @@ 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 )
@@ -181,9 +181,14 @@ void wxColour::CalcPixel( GdkColormap *cmap )
     
     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))
+#endif
     {
         GdkColor *colors = cmap->colors;
         int max = 3 * (65536);