use IMPLEMENT_APP_CONSOLE and not IMPLEMENT_APP for console apps

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 01c75ff3421159374de10cf57d68c8c22d07d5d1..b2bb1b993a194809351ea0b9e40ccd354981252f 100644 (file)
--- 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 ) )