X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..6c73e20df7f3a7ea8c2059a816ffd3655ea2b848:/src/univ/ctrlrend.cpp

diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index 5a803f20a0..cda4d045a1 100644
--- a/src/univ/ctrlrend.cpp
+++ b/src/univ/ctrlrend.cpp
@@ -32,6 +32,7 @@
     #include "wx/scrolbar.h"
     #include "wx/dc.h"
     #include "wx/log.h"
+    #include "wx/gauge.h"
 #endif // WX_PRECOMP
 
 #include "wx/image.h"
@@ -40,10 +41,6 @@
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 
-#if wxUSE_GAUGE
-    #include "wx/gauge.h"
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -130,6 +127,8 @@ void wxRenderer::StandardDrawTextLine(wxDC& dc,
 // wxRenderer: scrollbar geometry
 // ----------------------------------------------------------------------------
 
+#if wxUSE_SCROLLBAR
+
 /* static */
 void wxRenderer::StandardScrollBarThumbSize(wxCoord length,
                                             int thumbPos,
@@ -389,6 +388,8 @@ wxHitTest wxRenderer::StandardHitTestScrollbar(const wxScrollBar *scrollbar,
     }
 }
 
+#endif // wxUSE_SCROLLBAR
+
 wxRenderer::~wxRenderer()
 {
 }
@@ -503,11 +504,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 +544,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 +656,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,