added GTK+ 2.6 implementation of wxAboutBox

[wxWidgets.git] / src / common / dcbase.cpp

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index f637c952d3dac0e103e561174fe80fdf2c7b1a9e..994dfcee37a437e5d23fdfdeb19e3b05181f00fa 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -25,7 +25,10 @@
 #endif
 
 #include "wx/dc.h"
-#include "wx/math.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/math.h"
+#endif
 
 // bool wxDCBase::sm_cacheing = false;
 
@@ -414,7 +417,7 @@ bool wxDCBase::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths)
 {
     int totalWidth = 0;
 
-    const size_t len = text.Length();
+    const size_t len = text.length();
     widths.Empty();
     widths.Add(0, len);
 
@@ -773,7 +776,7 @@ void wxDCBase::DoGradientFillLinear(const wxRect& rect,
     SetPen(oldPen);
 }
 
-void wxDCBase::GradientFillConcentric(const wxRect& rect,
+void wxDCBase::DoGradientFillConcentric(const wxRect& rect,
                                       const wxColour& initialColour,
                                       const wxColour& destColour,
                                       const wxPoint& circleCenter)