add emission hook from RemoveIdleSource (was RemoveIdleTag); minor cleanup

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

diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index 6f13810965d9ae7a40f9a96f9cbe2aaa373f4fbe..56e99ae7dd0d34b0edca259815c4bc7ef39dde33 100644 (file)
--- a/src/univ/ctrlrend.cpp
+++ b/src/univ/ctrlrend.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        univ/ctrlrend.cpp
+// Name:        src/univ/ctrlrend.cpp
 // Purpose:     wxControlRenderer implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -31,19 +31,15 @@
     #include "wx/listbox.h"
     #include "wx/scrolbar.h"
     #include "wx/dc.h"
+    #include "wx/log.h"
+    #include "wx/gauge.h"
+    #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/colschem.h"
 
-#if wxUSE_GAUGE
-#include "wx/gauge.h"
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -130,6 +126,8 @@ void wxRenderer::StandardDrawTextLine(wxDC& dc,
 // wxRenderer: scrollbar geometry
 // ----------------------------------------------------------------------------
 
+#if wxUSE_SCROLLBAR
+
 /* static */
 void wxRenderer::StandardScrollBarThumbSize(wxCoord length,
                                             int thumbPos,
@@ -389,6 +387,8 @@ wxHitTest wxRenderer::StandardHitTestScrollbar(const wxScrollBar *scrollbar,
     }
 }
 
+#endif // wxUSE_SCROLLBAR
+
 wxRenderer::~wxRenderer()
 {
 }
@@ -503,11 +503,13 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
             }
         }
     }
+#if wxUSE_IMAGE
     else if ( stretch & wxEXPAND )
     {
         // stretch bitmap to fill the entire control
         bmp = wxBitmap(wxImage(bmp.ConvertToImage()).Scale(rect.width, rect.height));
     }
+#endif // wxUSE_IMAGE
     else // not stretched, not tiled
     {
         if ( alignment & wxALIGN_RIGHT )
@@ -541,6 +543,8 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
     dc.DrawBitmap(bmp, x, y, true /* use mask */);
 }
 
+#if wxUSE_SCROLLBAR
+
 void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
                                       int WXUNUSED(thumbPosOld))
 {
@@ -651,6 +655,8 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
     }
 }
 
+#endif // wxUSE_SCROLLBAR
+
 void wxControlRenderer::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
     wxASSERT_MSG( x1 == x2 || y1 == y2,
@@ -868,4 +874,3 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
 }
 
 #endif // wxUSE_GAUGE
-