// Author: Vaclav Slavik
// RCS-ID: $Id$
// Copyright: (c) 1999 Vaclav Slavik
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation
#endif
FORCE_LINK_ME(m_layout)
-
-#include <stdlib.h> // bsearch()
+#ifdef __WXWINCE__
+ #include "wx/msw/wince/missing.h" // for bsearch()
+#else
+ #include <stdlib.h> // bsearch()
+#endif
//-----------------------------------------------------------------------------
// wxHtmlPageBreakCell
void Draw(wxDC& WXUNUSED(dc),
int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
- wxHtmlRenderingState& WXUNUSED(state)) {}
+ wxHtmlRenderingInfo& WXUNUSED(info)) {}
private:
DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)
else
c->SetAlignHor(old);
- return TRUE;
+ return true;
}
else
{
- return FALSE;
+ // Same as BR
+ int al = m_WParser->GetContainer()->GetAlignHor();
+ wxHtmlContainerCell *c;
+
+ m_WParser->CloseContainer();
+ c = m_WParser->OpenContainer();
+ c->SetAlignHor(al);
+ c->SetAlign(tag);
+ c->SetMinHeight(m_WParser->GetCharHeight());
+ return false;
}
}
wxHtmlWindow *wfr = (wxHtmlWindow*)(m_WParser->GetWindow());
if (wfr)
{
- const wxString& src = *m_WParser->GetSource();
- wfr->OnSetTitle(src.Mid(tag.GetBeginPos(),
- tag.GetEndPos1()-tag.GetBeginPos()));
+ wxString title = m_WParser->GetSource()->Mid(
+ tag.GetBeginPos(),
+ tag.GetEndPos1()-tag.GetBeginPos());
+#if !wxUSE_UNICODE
+ wxCSConv conv(m_WParser->GetInputEncoding());
+ title = wxString(title.wc_str(conv), wxConvLocal);
+#endif
+ title = m_WParser->GetEntitiesParser()->Parse(title);
+ wfr->OnSetTitle(title);
}
}
return TRUE;