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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 01c75ff342..b08a6b4ab4 100644
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -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 ) )