X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc536d358374987326d93adb1012b6eda9435a0..b7c542d5c6104aa3a52b0cafda59dff03510e888:/src/gtk/colour.cpp?ds=sidebyside diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 2b63a69a0c..3e2386a840 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -92,14 +92,8 @@ void wxColourRefData::FreeColour() { if (m_colormap) { -#ifdef __WXGTK20__ if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || (m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) -#else - GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) m_colormap; - if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || - (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) -#endif { int idx = m_color.pixel; colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1; @@ -117,14 +111,8 @@ void wxColourRefData::AllocColour( GdkColormap *cmap ) 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 { m_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE ); int idx = m_color.pixel;