/////////////////////////////////////////////////////////////////////////////
-// Name: m_layout.cpp
+// Name: src/html/m_layout.cpp
// Purpose: wxHtml module for basic paragraphs/layout handling
// Author: Vaclav Slavik
// RCS-ID: $Id$
#include "wx/wxprec.h"
-#include "wx/defs.h"
-
-#if wxUSE_HTML && wxUSE_STREAMS
-
#ifdef __BORLANDC__
#pragma hdrstop
#endif
-#ifndef WXPRECOMP
-#endif
+#if wxUSE_HTML && wxUSE_STREAMS
-#include "wx/image.h"
+#ifndef WX_PRECOMP
+ #include "wx/image.h"
+#endif
#include "wx/html/forcelnk.h"
#include "wx/html/m_templ.h"
wxHtmlPageBreakCell() {}
bool AdjustPagebreak(int* pagebreak,
- int* known_pagebreaks = NULL,
- int number_of_pages = 0) const;
+ const wxArrayInt& known_pagebreaks,
+ int pageHeight) const;
+
void Draw(wxDC& WXUNUSED(dc),
int WXUNUSED(x), int WXUNUSED(y),
int WXUNUSED(view_y1), int WXUNUSED(view_y2),
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, int* known_pagebreaks, int number_of_pages) const
+bool
+wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak,
+ const wxArrayInt& known_pagebreaks,
+ int WXUNUSED(pageHeight)) const
{
// When we are counting pages, 'known_pagebreaks' is non-NULL.
// That's the only time we change 'pagebreak'. Otherwise, pages
// 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(NULL == known_pagebreaks || *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.
- int* where = (int*) bsearch(&total_height, known_pagebreaks,
- 1 + number_of_pages, sizeof(int),
- wxInteger_compare);
+ // a pagebreak here.
+ int where = known_pagebreaks.Index( total_height);
// Add a pagebreak only if there isn't one already set here.
- if(NULL != where)
- {
+ if( wxNOT_FOUND != where)
+ {
return false;
- }
+ }
else
- {
+ {
*pagebreak = m_PosY;
return true;
- }
+ }
}
+
+
TAG_HANDLER_BEGIN(P, "P")
TAG_HANDLER_CONSTR(P) { }
TAG_HANDLER_PROC(tag)
{
- if (m_WParser->GetWindow())
+ wxHtmlWindowInterface *winIface = m_WParser->GetWindowInterface();
+ if (winIface)
{
- wxHtmlWindow *wfr = (wxHtmlWindow*)(m_WParser->GetWindow());
- if (wfr)
+ wxString title(tag.GetBeginIter(), tag.GetEndIter1());
+#if !wxUSE_UNICODE
+ const wxFontEncoding enc = m_WParser->GetInputEncoding();
+ if ( enc != wxFONTENCODING_DEFAULT )
{
- 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
- title = m_WParser->GetEntitiesParser()->Parse(title);
- wfr->OnSetTitle(title);
+ // 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);
}
return true;
}
if (tag.GetParamAsColour(wxT("LINK"), &clr))
m_WParser->SetLinkColor(clr);
+ wxHtmlWindowInterface *winIface = m_WParser->GetWindowInterface();
+ // the rest of this function requires a window:
+ if ( !winIface )
+ return false;
+
if (tag.HasParam(wxT("BACKGROUND")))
{
wxFSFile *fileBgImage = m_WParser->OpenURL
wxInputStream *is = fileBgImage->GetStream();
if ( is )
{
-#if !defined(__WXMSW__) || wxUSE_WXDIB
wxImage image(*is);
- if ( image.Ok() )
- m_WParser->GetWindow()->SetBackgroundImage(image);
-#endif
+ if ( image.IsOk() )
+ winIface->SetHTMLBackgroundImage(image);
}
+
+ delete fileBgImage;
}
}
{
m_WParser->GetContainer()->InsertCell(
new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND));
- if (m_WParser->GetWindow() != NULL)
- m_WParser->GetWindow()->SetBackgroundColour(clr);
+ winIface->SetHTMLBackgroundColour(clr);
}
return false;
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);
projects / wxWidgets.git / blobdiff