diff --git a/common/dialogs/wx_html_report_panel.cpp b/common/dialogs/wx_html_report_panel.cpp
index 7a14d14748..53b3c26888 100644
--- a/common/dialogs/wx_html_report_panel.cpp
+++ b/common/dialogs/wx_html_report_panel.cpp
@@ -207,12 +207,11 @@ wxString WX_HTML_REPORT_PANEL::addHeader( const wxString& aBody )
{
wxColour bgcolor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW );
wxColour fgcolor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
- wxString s = "";
- s += aBody;
- s += "";
- return s;
+ return wxString::Format( wxT( "%s" ),
+ bgcolor.GetAsString( wxC2S_HTML_SYNTAX ),
+ fgcolor.GetAsString( wxC2S_HTML_SYNTAX ),
+ aBody );
}
diff --git a/eeschema/dialog_erc_listbox.h b/eeschema/dialog_erc_listbox.h
index 1b18d001c3..69b98c30d0 100644
--- a/eeschema/dialog_erc_listbox.h
+++ b/eeschema/dialog_erc_listbox.h
@@ -71,7 +71,9 @@ public:
void DisplayList()
{
wxString htmlpage;
-
+ wxColour bgcolor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW );
+ wxColour lncolor = wxSystemSettings::GetColour( wxSYS_COLOUR_HOTLIGHT );
+ wxColour fgcolor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
// for each marker, build a link like:
// text to click
// The "text to click" is the error name (first line of the full error text).
@@ -79,13 +81,18 @@ public:
for( unsigned ii = 0; ii < m_MarkerListReferences.size(); ii++ )
{
- marker_text.Printf( wxT( "" ), ii );
- marker_text << m_MarkerListReferences[ii]->GetReporter().ShowHtml();
- marker_text.Replace( wxT( "" ), false );
+ marker_text.Printf( wxT( "%s" ),
+ lncolor.GetAsString( wxC2S_HTML_SYNTAX ),
+ ii,
+ m_MarkerListReferences[ii]->GetReporter().ShowHtml() );
+ marker_text.Replace( wxT( "" ), wxT( "" ), false );
htmlpage += marker_text;
}
- SetPage( htmlpage );
+ SetPage( wxString::Format( wxT( "%s" ),
+ bgcolor.GetAsString( wxC2S_HTML_SYNTAX ),
+ fgcolor.GetAsString( wxC2S_HTML_SYNTAX ),
+ htmlpage ) );
}
/**
diff --git a/pcbnew/dialogs/dialog_drclistbox.h b/pcbnew/dialogs/dialog_drclistbox.h
index 402d3b95d7..06fab27c8c 100644
--- a/pcbnew/dialogs/dialog_drclistbox.h
+++ b/pcbnew/dialogs/dialog_drclistbox.h
@@ -249,7 +249,13 @@ public:
{
const DRC_ITEM* item = m_list->GetItem( (int) n );
if( item )
- return item->ShowHtml();
+ {
+ wxColour color = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
+
+ return wxString::Format( wxT( "%s" ),
+ color.GetAsString( wxC2S_HTML_SYNTAX ),
+ item->ShowHtml() );
+ }
}
return wxString();
}