Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Forgot to convert a string in colour name lookup.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-10-13 13:22:12 +00:00
parent e328b2a64d
commit 441534fce3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gtk/colour.cpp
View File

@@ -13,6 +13,7 @@
#endif #endif
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/gtk/private.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
@@ -167,7 +168,7 @@ void wxColour::InitFromName( const wxString &colourName )
{ {
m_refData = new wxColourRefData(); 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 // VZ: asserts are good in general but this one is triggered by
// calling wxColourDatabase::FindColour() with an // calling wxColourDatabase::FindColour() with an

3
src/gtk1/colour.cpp
View File

@@ -13,6 +13,7 @@
#endif #endif
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/gtk/private.h"
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
@@ -167,7 +168,7 @@ void wxColour::InitFromName( const wxString &colourName )
{ {
m_refData = new wxColourRefData(); 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 // VZ: asserts are good in general but this one is triggered by
// calling wxColourDatabase::FindColour() with an // calling wxColourDatabase::FindColour() with an