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 75539ac04cbc80eaa0b99d3b1be1dabc31d34c40..bc276a675acd8ce3d7b6ed1bd02a3cc46645b041 100644 (file)
--- a/src/univ/renderer.cpp
+++ b/src/univ/renderer.cpp
@@ -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"


@@ -428,10 +429,6 @@ void wxControlRenderer::DrawLabel(const wxBitmap& bitmap,
         if ( bitmap.Ok() )
         {
             rectLabel.Inflate(-marginX, -marginY);
         if ( bitmap.Ok() )
         {
             rectLabel.Inflate(-marginX, -marginY);

-            
-            // I don't know why this is necessary. RR.
-            rectLabel.x ++;
-            rectLabel.y ++;

         }
 
         wxControl *ctrl = wxStaticCast(m_window, wxControl);
         }
 
         wxControl *ctrl = wxStaticCast(m_window, wxControl);


@@ -512,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.ConvertToImage()).Scale(rect.width, rect.height);
+        bmp = wxBitmap(wxImage(bmp.ConvertToImage()).Scale(rect.width, rect.height));

     }
     else // not stretched, not tiled
     {
     }
     else // not stretched, not tiled
     {