Include wx/math.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-15 17:58:49 +00:00
parent 0d1c8f39ba
commit 18680f8651
46 changed files with 238 additions and 237 deletions

View File

@@ -18,6 +18,7 @@
#include "wx/app.h"
#include "wx/window.h"
#include "wx/dcmemory.h"
#include "wx/math.h"
#endif
#include "wx/image.h"
@@ -26,8 +27,6 @@
#include "wx/x11/private.h"
#include "wx/math.h"
#if wxUSE_UNICODE
#include "glib.h"
#include "pango/pangox.h"
@@ -1594,7 +1593,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
#endif
{
XDrawString( (Display*) m_display, (Window) m_window,
(GC) m_textGC, x, y + XFontStructGetAscent(xfont), text.c_str(), text.Len() );
(GC) m_textGC, x, y + XFontStructGetAscent(xfont), text.c_str(), text.length() );
}
#if 0
@@ -1670,7 +1669,7 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
int direction, ascent, descent2;
XCharStruct overall;
XTextExtents( xfont, (char*) string.c_str(), string.Len(), &direction,
XTextExtents( xfont, (char*) string.c_str(), string.length(), &direction,
&ascent, &descent2, &overall);
if (width)