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

Fix STL build broken in 003faa9

Browse Source
This commit is contained in:
Paul Cornett
2017-11-25 11:26:07 -08:00
parent 17de4e31fb
commit 6830767839
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/window.cpp
View File

@@ -4573,12 +4573,12 @@ void wxWindowGTK::GTKApplyWidgetStyle(bool forceStyle)
if (isFg) if (isFg)
{ {
g_string_append_printf(css, "color:%s;", g_string_append_printf(css, "color:%s;",
static_cast<const char*>(fg.GetAsString(wxC2S_HTML_SYNTAX))); wxGtkString(gdk_rgba_to_string(fg)).c_str());
} }
if (isBg) if (isBg)
{ {
g_string_append_printf(css, "background:%s;", g_string_append_printf(css, "background:%s;",
static_cast<const char*>(bg.GetAsString(wxC2S_HTML_SYNTAX))); wxGtkString(gdk_rgba_to_string(bg)).c_str());
} }
if (isFont) if (isFont)
{ {
@@ -4662,8 +4662,8 @@ void wxWindowGTK::GTKApplyWidgetStyle(bool forceStyle)
if (gtk_check_version(3,20,0) == NULL) if (gtk_check_version(3,20,0) == NULL)
s = "selection"; s = "selection";
g_string_append_printf(css, "%s{color:%s;background:%s}", s, g_string_append_printf(css, "%s{color:%s;background:%s}", s,
static_cast<const char*>(fg_sel.GetAsString(wxC2S_HTML_SYNTAX)), wxGtkString(gdk_rgba_to_string(fg_sel)).c_str(),
static_cast<const char*>(bg_sel.GetAsString(wxC2S_HTML_SYNTAX))); wxGtkString(gdk_rgba_to_string(bg_sel)).c_str());
} }
if (m_styleProvider == NULL && (isFg || isBg || isFont)) if (m_styleProvider == NULL && (isFg || isBg || isFont))