fixed crash under GTK+ 2.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
54b5a79551
commit
31c8af3abb
@ -117,8 +117,8 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
|
|||||||
FreeColour();
|
FreeColour();
|
||||||
|
|
||||||
#ifdef __WXGTK20__
|
#ifdef __WXGTK20__
|
||||||
if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
|
if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) ||
|
||||||
(m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
|
(cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) )
|
||||||
#else
|
#else
|
||||||
GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
|
GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
|
||||||
if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
|
if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
|
||||||
|
@ -117,8 +117,8 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
|
|||||||
FreeColour();
|
FreeColour();
|
||||||
|
|
||||||
#ifdef __WXGTK20__
|
#ifdef __WXGTK20__
|
||||||
if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
|
if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) ||
|
||||||
(m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
|
(cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) )
|
||||||
#else
|
#else
|
||||||
GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
|
GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
|
||||||
if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
|
if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
|
||||||
|
Loading…
Reference in New Issue
Block a user