Remove unnecessary header dependencies. Fix resulting compilation

[wxWidgets.git] / src / univ / renderer.cpp

diff --git a/src/univ/renderer.cpp b/src/univ/renderer.cpp
index 36f7f0d853dcac93b6cb6ef0b045a899a8f1fa30..bc276a675acd8ce3d7b6ed1bd02a3cc46645b041 100644 (file)
--- a/src/univ/renderer.cpp
+++ b/src/univ/renderer.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     15.08.00
 // RCS-ID:      $Id$

-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -38,6 +38,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/image.h"
 #endif // WX_PRECOMP
 
 #include "wx/image.h"

+#include "wx/log.h"

 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"


@@ -417,6 +418,7 @@ wxControlRenderer::wxControlRenderer(wxWindow *window,
 void wxControlRenderer::DrawLabel(const wxBitmap& bitmap,
                                   wxCoord marginX, wxCoord marginY)
 {
 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_dc.SetFont(m_window->GetFont());
     m_dc.SetTextForeground(m_window->GetForegroundColour());
 


@@ -463,7 +465,8 @@ void wxControlRenderer::DrawButtonBorder()
 
     m_renderer->DrawButtonBorder(m_dc, m_rect, flags, &m_rect);
 
 
     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)
 }
 
 void wxControlRenderer::DrawBitmap(const wxBitmap& bitmap)


@@ -506,7 +509,7 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
     else if ( stretch & wxEXPAND )
     {
         // stretch bitmap to fill the entire control
     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
     {
     }
     else // not stretched, not tiled
     {


@@ -771,7 +774,9 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
     wxRect rect = m_rect;
     rect.Deflate(1); // FIXME this depends on the border width
 
     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() )
     {
 
     if ( gauge->IsSmooth() )
     {