Improve the error messages slightly.

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index afb1cdc00e130600a3e9437957e5a4993f94ba38..e09ef66effa636aae85e286748284c3e98149736 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -25,14 +25,17 @@ 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;
     }
 
-    ~wxColourRefData()
+    virtual ~wxColourRefData()
     {
         FreeColour();
     }
@@ -109,7 +112,8 @@ bool wxColour::operator == ( const wxColour& col ) const
            refData->m_blue == that_refData->m_blue;
 }
 
-void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char blue )
+void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
+                        unsigned char WXUNUSED(alpha))
 {
     UnRef();
 
@@ -154,7 +158,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") );