Possibly cured the assertion message dialog paint problem,

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 47af43accc01b8104a185dae14a22294e0fad5cd..84c790a329fcea1dbd7299c85b0355ce1c6054de 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -36,6 +36,7 @@ public:
     }
     
     wxColourRefData(const wxColourRefData& data)
     }
     
     wxColourRefData(const wxColourRefData& data)

+        : wxObjectRefData()

     {
         m_color = data.m_color;
         m_colormap = data.m_colormap;
     {
         m_color = data.m_color;
         m_colormap = data.m_colormap;


@@ -117,8 +118,8 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
     FreeColour();
     
 #ifdef __WXGTK20__
     FreeColour();
     
 #ifdef __WXGTK20__

-    if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
-       (m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
+    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) ||
 #else
     GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
     if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||