Menu/toolbar event handling now tries the window with the focus first.

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index a3292d450daafb1ba65df6aeddad52eacd5a3c63..72104a8843c05eb3c7f05642538911bea091c6f0 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -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;
 }
@@ -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;