Various compile fixes.

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

diff --git a/src/univ/renderer.cpp b/src/univ/renderer.cpp
index eebe8b30626e160de416d6a6429cb8a8fc0bcf8a..16c2c2de0449d19116dad854dcb54d484f690156 100644 (file)
--- a/src/univ/renderer.cpp
+++ b/src/univ/renderer.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     15.08.00
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     15.08.00
 // RCS-ID:      $Id$

-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -43,6 +43,10 @@
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 

+#if wxUSE_GAUGE
+#include "wx/gauge.h"
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -767,7 +771,9 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
     wxRect rect = m_rect;
     rect.Deflate(1); // FIXME this depends on the border width
 
     wxRect rect = m_rect;
     rect.Deflate(1); // FIXME this depends on the border width
 

-    m_dc.SetBrush(wxBrush(m_window->GetForegroundColour(), wxSOLID));
+    wxColour col = m_window->UseFgCol() ? m_window->GetForegroundColour()
+                                        : wxTHEME_COLOUR(GAUGE);
+    m_dc.SetBrush(wxBrush(col, wxSOLID));

 
     if ( gauge->IsSmooth() )
     {
 
     if ( gauge->IsSmooth() )
     {