From 372b0e766c756cfc6bcdb66e3f102a7604b2b2a2 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 4 Oct 2002 20:48:16 +0000 Subject: [PATCH] Applied patch to fix colour probs under wxGTK. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/colour.cpp | 3 +++ src/gtk1/colour.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 0eac04248a..8a4c885574 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -221,6 +221,9 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT; M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT; M_COLDATA->m_color.pixel = 0; + + M_COLDATA->m_colormap = (GdkColormap*) NULL; + M_COLDATA->m_hasPixel = FALSE; } unsigned char wxColour::Red() const diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 0eac04248a..8a4c885574 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -221,6 +221,9 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT; M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT; M_COLDATA->m_color.pixel = 0; + + M_COLDATA->m_colormap = (GdkColormap*) NULL; + M_COLDATA->m_hasPixel = FALSE; } unsigned char wxColour::Red() const