add wxUSE_DATAVIEWCTRL check to fix a hundred compilation errors

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

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index 82712095cd80d61c8b08333b7d29235b24c2a89a..e5234be3d45a63a4e2423b6e4e476c2f3a9e3e20 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -225,10 +225,10 @@ GdkColor *wxColour::GetColor() const
     return &M_COLDATA->m_color;
 }
 
-bool wxColour::FromString(const wxChar *str)
+bool wxColour::FromString(const wxString& str)
 {
     GdkColor colGDK;
-    if ( gdk_color_parse( str, &colGDK ) )
+    if ( gdk_color_parse( wxGTK_CONV(str), &colGDK ) )
     {
         UnRef();