use wxString instead of wxChar* in wxColour::Set/FromString

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-30 10:29:12 +00:00
parent 092793cb6d
commit e86d4e59c1
9 changed files with 15 additions and 23 deletions
--- 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();