#endif // WX_PRECOMP
#include "wx/image.h"
+#include "wx/log.h"
#include "wx/univ/theme.h"
#include "wx/univ/renderer.h"
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());
m_renderer->DrawButtonBorder(m_dc, m_rect, flags, &m_rect);
- m_renderer->DrawBackground(m_dc, wxTHEME_BG_COLOUR(m_window), m_rect, flags);
+ // Why do this here?
+ // m_renderer->DrawButtonSurface(m_dc, wxTHEME_BG_COLOUR(m_window), m_rect, flags );
}
void wxControlRenderer::DrawBitmap(const wxBitmap& bitmap)
else if ( stretch & wxEXPAND )
{
// stretch bitmap to fill the entire control
- bmp = wxImage(bmp).Scale(rect.width, rect.height).ConvertToBitmap();
+ bmp = wxBitmap(wxImage(bmp.ConvertToImage()).Scale(rect.width, rect.height));
}
else // not stretched, not tiled
{
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() )
{