Fixed GetShapeList and similar methods to use OOR.

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

diff --git a/src/univ/renderer.cpp b/src/univ/renderer.cpp
index 16c2c2de0449d19116dad854dcb54d484f690156..3d55a23cfba47ad6dc7a9c9720486d4cf7767a21 100644 (file)
--- 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)
 {
 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());
 


@@ -427,6 +428,10 @@ 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);


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

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