X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc8883366b1fbbf052bb85ba59ce8c134b668fa0..bba35861478a26f5d8c756a9a7fa2bbd19a69cb1:/src/gtk/colour.cpp

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 01c75ff342..b2bb1b993a 100644
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -20,7 +20,7 @@
 // wxColour
 //-----------------------------------------------------------------------------
 
-class wxColourRefData: public wxObjectRefData
+class wxColourRefData : public wxGDIRefData
 {
 public:
     wxColourRefData(guint16 red, guint16 green, guint16 blue, guint16 alpha)
@@ -169,18 +169,14 @@ 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") );
 
     return &M_COLDATA->m_color;
 }
 
-bool wxColour::FromString(const wxChar *str)
+bool wxColour::FromString(const wxString& str)
 {
     GdkColor colGDK;
     if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )