fix WXDLLIMPEXP_STC definition when building all wx libraries as DLLs (patch 1704527)

[wxWidgets.git] / src / html / m_layout.cpp

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 4986a9f649de6a34d14843fbfda79ee2a1ad47ca..57316f71f6065d698cc5453020a939bd50cc1241 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -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;
             }
         }