#if wxUSE_HTML && wxUSE_STREAMS
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
+ #include "wx/image.h"
#endif
-#include "wx/image.h"
-
#include "wx/html/forcelnk.h"
#include "wx/html/m_templ.h"
wxHtmlRenderingInfo& WXUNUSED(info)) {}
private:
- DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)
+ wxDECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell);
};
-// Comparison routine for bsearch into an int* array of pagebreaks.
-extern "C" int wxCMPFUNC_CONV wxInteger_compare(void const* i0, void const* i1)
-{
- return *(int*)i0 - *(int*)i1;
-}
-
bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_pagebreaks) const
{
// When we are counting pages, 'known_pagebreaks' is non-NULL.
// vertical position. Otherwise we'd be setting a pagebreak above
// the current cell, which is incorrect, or duplicating a
// pagebreak that has already been set.
- if( known_pagebreaks.Count() == 0 || *pagebreak <= m_PosY)
+ if( known_pagebreaks.GetCount() == 0 || *pagebreak <= m_PosY)
{
return false;
}
// m_PosY is only the vertical offset from the parent. The pagebreak
// required here is the total page offset, so m_PosY must be added
// to the parent's offset and height.
- int total_height = m_PosY + GetParent()->GetPosY() + GetParent()->GetHeight();
+ int total_height = m_PosY;
+ for ( wxHtmlCell *parent = GetParent(); parent; parent = parent->GetParent() )
+ {
+ total_height += parent->GetPosY();
+ }
+
// Search the array of pagebreaks to see whether we've already set
- // a pagebreak here. The standard bsearch() function is appropriate
- // because the array of pagebreaks through known_pagebreaks[number_of_pages]
- // is known to be sorted in strictly increasing order. '1 + number_of_pages'
- // is used as a bsearch() argument because the array contains a leading
- // zero plus one element for each page.
+ // a pagebreak here.
int where = known_pagebreaks.Index( total_height);
// Add a pagebreak only if there isn't one already set here.
if( wxNOT_FOUND != where)
wxHtmlWindowInterface *winIface = m_WParser->GetWindowInterface();
if (winIface)
{
- wxString title = m_WParser->GetSource()->Mid(
- tag.GetBeginPos(),
- tag.GetEndPos1()-tag.GetBeginPos());
-#if !wxUSE_UNICODE && wxUSE_WCHAR_T
- wxCSConv conv(m_WParser->GetInputEncoding());
- title = wxString(title.wc_str(conv), wxConvLocal);
-#endif
+ wxString title(tag.GetBeginIter(), tag.GetEndIter1());
+#if !wxUSE_UNICODE
+ const wxFontEncoding enc = m_WParser->GetInputEncoding();
+ if ( enc != wxFONTENCODING_DEFAULT )
+ {
+ // need to convert to the current one
+ title = wxString(title.wc_str(wxCSConv(enc)), wxConvLocal);
+ }
+#endif // !wxUSE_UNICODE
+
title = m_WParser->GetEntitiesParser()->Parse(title);
winIface->SetHTMLWindowTitle(title);
wxInputStream *is = fileBgImage->GetStream();
if ( is )
{
-#if !defined(__WXMSW__) || wxUSE_WXDIB
wxImage image(*is);
if ( image.Ok() )
winIface->SetHTMLBackgroundImage(image);
-#endif
}
+
+ delete fileBgImage;
}
}
wxHtmlCell *c = cont->GetLastChild();
m_WParser->SetScriptMode(issub ? wxHTML_SCRIPT_SUB : wxHTML_SCRIPT_SUP);
- m_WParser->SetScriptBaseline(oldbase + c->GetScriptBaseline());
+ m_WParser->SetScriptBaseline(
+ oldbase + c ? c->GetScriptBaseline() : 0);
// select smaller font
m_WParser->SetFontSize(m_WParser->GetFontSize()-2);