final revision

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

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index ecc6e00e4c4677246ee1eddaa81db85d848bddac..8f08d60562cbafc5b63fb6f83307c9a47f7c2bb4 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -507,7 +507,7 @@ void wxDCBase::GetMultiLineTextExtent(const wxString& text,
                                       wxCoord *x,
                                       wxCoord *y,
                                       wxCoord *h,
-                                      wxFont *font) const
+                                      const wxFont *font) const
 {
     wxCoord widthTextMax = 0, widthLine,
             heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
@@ -689,7 +689,7 @@ void wxDCBase::DrawLabel(const wxString& text,
         }
         else // not end of line
         {
-            if ( pc - text.begin() == (size_t)indexAccel )
+            if ( pc - text.begin() == indexAccel )
             {
                 // remeber to draw underscore here
                 GetTextExtent(curLine, &startUnderscore, NULL);