X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3ac6ee157ca7c666cea3c762276b02d0f38033e..88db1d64cb9e20de436a3503952dc9303060c33a:/src/html/m_layout.cpp diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index aa9ea66ee1..67e16e8952 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -4,7 +4,7 @@ // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows Licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation @@ -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 @@ -260,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; } }