]> git.saurik.com Git - wxWidgets.git/commitdiff
compilation fixes
authorVáclav Slavík <vslavik@fastmail.fm>
Thu, 5 Apr 2007 15:38:36 +0000 (15:38 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Thu, 5 Apr 2007 15:38:36 +0000 (15:38 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/x11/dcclient.cpp
src/x11/window.cpp

index 291b93b268d5e2a22f21fdade45005daab34e701..4ab1920f7e7fe636002f9c6480ec3ddd1311e407 100644 (file)
@@ -1563,7 +1563,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         slen = strlen(text);
         XCharStruct overall_return;
 
-        (void)XTextExtents(xfont, (char*) text.c_str(), slen, &direction,
+        (void)XTextExtents(xfont, (const char*) text.c_str(), slen, &direction,
                                  &ascent, &descent, &overall_return);
 
         cx = overall_return.width;
@@ -1661,7 +1661,7 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
     int direction, ascent, descent2;
     XCharStruct overall;
 
-    XTextExtents( xfont, (char*) string.c_str(), string.length(), &direction,
+    XTextExtents( xfont, (const char*) string.c_str(), string.length(), &direction,
         &ascent, &descent2, &overall);
 
     if (width)
index 7515a925466b7dc3cb64ad68963ca5154d1df2e6..2ebaa57dfc16b93d8f57ddb452b96b1668682737 100644 (file)
@@ -1120,7 +1120,7 @@ void wxWindowX11::GetTextExtent(const wxString& string,
     XCharStruct overall;
     int slen = string.length();
 
-    XTextExtents((XFontStruct*) pFontStruct, (char*) string.c_str(), slen,
+    XTextExtents((XFontStruct*) pFontStruct, (const char*) string.c_str(), slen,
                  &direction, &ascent, &descent2, &overall);
 
     if ( x )