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

diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index 39f549ef1e..cda4d045a1 100644
--- 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:
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "renderer.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -35,19 +31,16 @@
     #include "wx/listbox.h"
     #include "wx/scrolbar.h"
     #include "wx/dc.h"
+    #include "wx/log.h"
+    #include "wx/gauge.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
 // ============================================================================
@@ -134,6 +127,8 @@ void wxRenderer::StandardDrawTextLine(wxDC& dc,
 // wxRenderer: scrollbar geometry
 // ----------------------------------------------------------------------------
 
+#if wxUSE_SCROLLBAR
+
 /* static */
 void wxRenderer::StandardScrollBarThumbSize(wxCoord length,
                                             int thumbPos,
@@ -177,7 +172,8 @@ wxRect wxRenderer::StandardGetScrollbarRect(const wxScrollBar *scrollbar,
     }
 
     wxSize sizeTotal = scrollbar->GetClientSize();
-    wxCoord *start, *width, length, arrow;
+    wxCoord *start, *width;
+    wxCoord length, arrow;
     wxRect rect;
     if ( scrollbar->IsVertical() )
     {
@@ -392,6 +388,8 @@ wxHitTest wxRenderer::StandardHitTestScrollbar(const wxScrollBar *scrollbar,
     }
 }
 
+#endif // wxUSE_SCROLLBAR
+
 wxRenderer::~wxRenderer()
 {
 }
@@ -506,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 )
@@ -544,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))
 {
@@ -654,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,
@@ -813,7 +817,8 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
         int steps = ((lenTotal + step - 1) * pos) / (max * step);
 
         // calc the coords of one small rect
-        wxCoord *px, dx, dy;
+        wxCoord *px;
+        wxCoord dx, dy;
         if ( gauge->IsVertical() )
         {
             // draw from bottom to top: so first set y to the bottom