flush stderr in wxSafeShowMessage(): this might be unnecessary but definitely doesn...

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index afb1cdc00e130600a3e9437957e5a4993f94ba38..79b2c37f1df2ac2e1cde63d154aeaa37c9502c58 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -25,8 +25,11 @@ class wxColourRefData: public wxObjectRefData
 public:
     wxColourRefData(guint16 red, guint16 green, guint16 blue)
     {
+        m_color.red =
         m_red = red;
+        m_color.green =
         m_green = green;
+        m_color.blue =
         m_blue = blue;
         m_color.pixel = 0;
         m_colormap = NULL;
@@ -154,7 +157,11 @@ int wxColour::GetPixel() const
     return M_COLDATA->m_color.pixel;
 }
 
+#ifdef __WXGTK24__
 const GdkColor *wxColour::GetColor() const
+#else
+      GdkColor *wxColour::GetColor() const
+#endif
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );