X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4460b6c48b0a4b12b30ea22072ef3262db1f5c3f..1e151594721201f2048aa295dcf35acd28f012b9:/src/html/m_layout.cpp diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index b524a9db1c..0809130d42 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -4,9 +4,9 @@ // 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 @@ -30,8 +30,11 @@ FORCE_LINK_ME(m_layout) - -#include // bsearch() +#ifdef __WXWINCE__ + #include "wx/msw/wince/missing.h" // for bsearch() +#else + #include // bsearch() +#endif //----------------------------------------------------------------------------- // wxHtmlPageBreakCell @@ -77,7 +80,7 @@ public: 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) @@ -94,16 +97,16 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks, // When we are counting pages, 'known_pagebreaks' is non-NULL. // That's the only time we change 'pagebreak'. Otherwise, pages // were already counted, 'known_pagebreaks' is NULL, and we don't - // do anything except return FALSE. + // do anything except return false. // - // We also simply return FALSE if the 'pagebreak' argument is + // We also simply return false if the 'pagebreak' argument is // less than (vertically above) or the same as the current // 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) { - return FALSE; + return false; } // m_PosY is only the vertical offset from the parent. The pagebreak @@ -123,16 +126,17 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks, // Add a pagebreak only if there isn't one already set here. if(NULL != where) { - return FALSE; + return false; } else { *pagebreak = m_PosY; - return TRUE; + return true; } } TAG_HANDLER_BEGIN(P, "P") + TAG_HANDLER_CONSTR(P) { } TAG_HANDLER_PROC(tag) { @@ -143,7 +147,7 @@ TAG_HANDLER_BEGIN(P, "P") } m_WParser->GetContainer()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP); m_WParser->GetContainer()->SetAlign(tag); - return FALSE; + return false; } TAG_HANDLER_END(P) @@ -151,6 +155,7 @@ TAG_HANDLER_END(P) TAG_HANDLER_BEGIN(BR, "BR") + TAG_HANDLER_CONSTR(BR) { } TAG_HANDLER_PROC(tag) { @@ -162,7 +167,7 @@ TAG_HANDLER_BEGIN(BR, "BR") c->SetAlignHor(al); c->SetAlign(tag); c->SetMinHeight(m_WParser->GetCharHeight()); - return FALSE; + return false; } TAG_HANDLER_END(BR) @@ -170,6 +175,7 @@ TAG_HANDLER_END(BR) TAG_HANDLER_BEGIN(CENTER, "CENTER") + TAG_HANDLER_CONSTR(CENTER) { } TAG_HANDLER_PROC(tag) { @@ -198,9 +204,9 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER") else c->SetAlignHor(old); - return TRUE; + return true; } - else return FALSE; + else return false; } TAG_HANDLER_END(CENTER) @@ -208,23 +214,24 @@ TAG_HANDLER_END(CENTER) TAG_HANDLER_BEGIN(DIV, "DIV") + TAG_HANDLER_CONSTR(DIV) { } TAG_HANDLER_PROC(tag) { if(tag.HasParam(wxT("STYLE"))) { - if(tag.GetParam(wxT("STYLE")).IsSameAs(wxT("PAGE-BREAK-BEFORE:ALWAYS"), FALSE)) + if(tag.GetParam(wxT("STYLE")).IsSameAs(wxT("PAGE-BREAK-BEFORE:ALWAYS"), false)) { m_WParser->CloseContainer(); m_WParser->OpenContainer()->InsertCell(new wxHtmlPageBreakCell); m_WParser->CloseContainer(); m_WParser->OpenContainer(); - return FALSE; + return false; } else { // Treat other STYLE parameters here when they're supported. - return FALSE; + return false; } } else if(tag.HasParam(wxT("ALIGN"))) @@ -256,11 +263,20 @@ TAG_HANDLER_BEGIN(DIV, "DIV") 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; } } @@ -270,6 +286,7 @@ TAG_HANDLER_END(DIV) TAG_HANDLER_BEGIN(TITLE, "TITLE") + TAG_HANDLER_CONSTR(TITLE) { } TAG_HANDLER_PROC(tag) { @@ -278,12 +295,18 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE") 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; + return true; } TAG_HANDLER_END(TITLE) @@ -292,6 +315,7 @@ TAG_HANDLER_END(TITLE) TAG_HANDLER_BEGIN(BODY, "BODY") + TAG_HANDLER_CONSTR(BODY) { } TAG_HANDLER_PROC(tag) { @@ -313,7 +337,7 @@ TAG_HANDLER_BEGIN(BODY, "BODY") if (m_WParser->GetWindow() != NULL) m_WParser->GetWindow()->SetBackgroundColour(clr); } - return FALSE; + return false; } TAG_HANDLER_END(BODY) @@ -321,6 +345,7 @@ TAG_HANDLER_END(BODY) TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE") + TAG_HANDLER_CONSTR(BLOCKQUOTE) { } TAG_HANDLER_PROC(tag) { @@ -341,7 +366,7 @@ TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE") c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_BOTTOM); m_WParser->CloseContainer(); m_WParser->OpenContainer(); - return TRUE; + return true; } TAG_HANDLER_END(BLOCKQUOTE) @@ -351,7 +376,9 @@ TAG_HANDLER_END(BLOCKQUOTE) // Tag handler for tags that we have to ignore, otherwise non-text data // would show up as text: TAG_HANDLER_BEGIN(DoNothing, "SCRIPT") - TAG_HANDLER_PROC(tag) + TAG_HANDLER_CONSTR(DoNothing) { } + + TAG_HANDLER_PROC(WXUNUSED(tag)) { return true; }