X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9076e56d931c244f41283a33a9808b2e56176011..ad8d42f83cdf7a4f26969957e94ed166a1a5710e:/src/html/htmlcell.cpp diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp index 3244eb577f..4bed6f3f9c 100644 --- a/src/html/htmlcell.cpp +++ b/src/html/htmlcell.cpp @@ -15,13 +15,14 @@ #if wxUSE_HTML && wxUSE_STREAMS -#ifndef WXPRECOMP +#ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/brush.h" #include "wx/colour.h" #include "wx/dc.h" #include "wx/settings.h" #include "wx/module.h" + #include "wx/wxcrtvararg.h" #endif #include "wx/html/htmlcell.h" @@ -355,7 +356,11 @@ IMPLEMENT_ABSTRACT_CLASS(wxHtmlWordCell, wxHtmlCell) wxHtmlWordCell::wxHtmlWordCell(const wxString& word, const wxDC& dc) : wxHtmlCell() { m_Word = word; - dc.GetTextExtent(m_Word, &m_Width, &m_Height, &m_Descent); + wxCoord w, h, d; + dc.GetTextExtent(m_Word, &w, &h, &d); + m_Width = w; + m_Height = h; + m_Descent = d; SetCanLiveOnPagebreak(false); m_allowLinebreak = true; }