more work on text selection: selecting should work now, but there's no clipboard...

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

diff --git a/src/univ/renderer.cpp b/src/univ/renderer.cpp
index 3d55a23cfba47ad6dc7a9c9720486d4cf7767a21..8a0ae893f4716d59a87c781948ad52c51ad7686d 100644 (file)
--- a/src/univ/renderer.cpp
+++ b/src/univ/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -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);


@@ -468,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)


@@ -511,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
     {