X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/442b35b53bf95f5c6c003ea9ddbefd17adbc2a00..9691c806e6fbb08b01c9eec9998ad1e8242c7df3:/src/univ/renderer.cpp diff --git a/src/univ/renderer.cpp b/src/univ/renderer.cpp index 19c027723c..4053fbf68f 100644 --- a/src/univ/renderer.cpp +++ b/src/univ/renderer.cpp @@ -417,6 +417,7 @@ wxControlRenderer::wxControlRenderer(wxWindow *window, void wxControlRenderer::DrawLabel(const wxBitmap& bitmap, wxCoord marginX, wxCoord marginY) { + m_dc.SetBackgroundMode(wxTRANSPARENT); m_dc.SetFont(m_window->GetFont()); m_dc.SetTextForeground(m_window->GetForegroundColour()); @@ -771,7 +772,9 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge) wxRect rect = m_rect; rect.Deflate(1); // FIXME this depends on the border width - m_dc.SetBrush(wxBrush(m_window->GetForegroundColour(), wxSOLID)); + wxColour col = m_window->UseFgCol() ? m_window->GetForegroundColour() + : wxTHEME_COLOUR(GAUGE); + m_dc.SetBrush(wxBrush(col, wxSOLID)); if ( gauge->IsSmooth() ) {