X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d70ab089f130b18fadf17393ce0779f6d8010bf..129b8b1a215fc1fcc1b9f06daa0aeaf22bbce614:/src/html/m_layout.cpp diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index 4986a9f649..1bea340201 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -15,7 +15,7 @@ #if wxUSE_HTML && wxUSE_STREAMS -#ifndef WXPRECOMP +#ifndef WX_PRECOMP #include "wx/image.h" #endif @@ -100,7 +100,7 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_page // 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; } @@ -346,12 +346,12 @@ TAG_HANDLER_BEGIN(BODY, "BODY") wxInputStream *is = fileBgImage->GetStream(); if ( is ) { -#if !defined(__WXMSW__) || wxUSE_WXDIB wxImage image(*is); if ( image.Ok() ) winIface->SetHTMLBackgroundImage(image); -#endif } + + delete fileBgImage; } }