X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a1b6485f3f2d300012cde053c572f21f1f8bd3..34cf96b216bd2a94c84defdde02cbbbd2f36db6d:/src/html/htmlcell.cpp?ds=sidebyside diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index d56483bf6e..ace347c57a 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: htmlcell.cpp +// Name: src/html/htmlcell.cpp // Purpose: wxHtmlCell - basic element of HTML output // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -9,15 +9,14 @@ #include "wx/wxprec.h" -#include "wx/defs.h" - -#if wxUSE_HTML && wxUSE_STREAMS - #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_HTML && wxUSE_STREAMS + #ifndef WXPRECOMP + #include "wx/dynarray.h" #include "wx/brush.h" #include "wx/colour.h" #include "wx/dc.h" @@ -27,7 +26,6 @@ #include "wx/html/htmlwin.h" #include "wx/settings.h" #include "wx/module.h" -#include "wx/dynarray.h" #include @@ -1149,7 +1147,7 @@ void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale int wdi; wxString wd = tag.GetParam(wxT("WIDTH")); - if (wd[wd.Length()-1] == wxT('%')) + if (wd[wd.length()-1] == wxT('%')) { wxSscanf(wd.c_str(), wxT("%i%%"), &wdi); SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);