Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-04-05 15:38:36 +00:00
parent 4bd5322403
commit 3ad2d97259
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/x11/dcclient.cpp
View File

@@ -1563,7 +1563,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
slen = strlen(text); slen = strlen(text);
XCharStruct overall_return; 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); &ascent, &descent, &overall_return);
cx = overall_return.width; cx = overall_return.width;
@@ -1661,7 +1661,7 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
int direction, ascent, descent2; int direction, ascent, descent2;
XCharStruct overall; XCharStruct overall;
XTextExtents( xfont, (char*) string.c_str(), string.length(), &direction, XTextExtents( xfont, (const char*) string.c_str(), string.length(), &direction,
&ascent, &descent2, &overall); &ascent, &descent2, &overall);
if (width) if (width)

2
src/x11/window.cpp
View File

@@ -1120,7 +1120,7 @@ void wxWindowX11::GetTextExtent(const wxString& string,
XCharStruct overall; XCharStruct overall;
int slen = string.length(); 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); &direction, &ascent, &descent2, &overall);
if ( x ) if ( x )