From 441534fce30ae3fbc414984744afc5cbc28a990b Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sun, 13 Oct 2002 13:22:12 +0000 Subject: [PATCH] Forgot to convert a string in colour name lookup. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/colour.cpp | 3 ++- src/gtk1/colour.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 8a4c885574..21d852e55d 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -13,6 +13,7 @@ #endif #include "wx/gdicmn.h" +#include "wx/gtk/private.h" #include #include @@ -167,7 +168,7 @@ void wxColour::InitFromName( const wxString &colourName ) { m_refData = new wxColourRefData(); - if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color )) + if (!gdk_color_parse( wxGTK_CONV( colourName ), &M_COLDATA->m_color )) { // VZ: asserts are good in general but this one is triggered by // calling wxColourDatabase::FindColour() with an diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 8a4c885574..21d852e55d 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -13,6 +13,7 @@ #endif #include "wx/gdicmn.h" +#include "wx/gtk/private.h" #include #include @@ -167,7 +168,7 @@ void wxColour::InitFromName( const wxString &colourName ) { m_refData = new wxColourRefData(); - if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color )) + if (!gdk_color_parse( wxGTK_CONV( colourName ), &M_COLDATA->m_color )) { // VZ: asserts are good in general but this one is triggered by // calling wxColourDatabase::FindColour() with an