X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d7b3f69f2b8ab29b3cb8ceb6e2923018cf96562..5db33691bede6529448b2c29c5568512d09041ed:/src/html/m_layout.cpp

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 7eddd4a943..0bc769bf52 100644
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -2,7 +2,6 @@
 // Name:        src/html/m_layout.cpp
 // Purpose:     wxHtml module for basic paragraphs/layout handling
 // Author:      Vaclav Slavik
-// RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -71,7 +70,8 @@ public:
     wxHtmlPageBreakCell() {}
 
     bool AdjustPagebreak(int* pagebreak,
-                         wxArrayInt& known_pagebreaks) const;
+                         const wxArrayInt& known_pagebreaks,
+                         int pageHeight) const;
 
     void Draw(wxDC& WXUNUSED(dc),
               int WXUNUSED(x), int WXUNUSED(y),
@@ -79,19 +79,13 @@ public:
               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"
-{
-    static int wxCMPFUNC_CONV wxInteger_compare(void const* i0, void const* i1)
-    {
-        return *(int*)i0 - *(int*)i1;
-    }
-}
-
-bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_pagebreaks) 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
@@ -119,11 +113,7 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_page
 
 
     // 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.
+    // a pagebreak here.
     int where = known_pagebreaks.Index( total_height);
     // Add a pagebreak only if there isn't one already set here.
     if( wxNOT_FOUND != where)
@@ -222,9 +212,10 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
 
     TAG_HANDLER_PROC(tag)
     {
-        if(tag.HasParam(wxT("STYLE")))
+        wxString style;
+        if(tag.GetParamAsString(wxT("STYLE"), &style))
         {
-            if(tag.GetParam(wxT("STYLE")).IsSameAs(wxT("PAGE-BREAK-BEFORE:ALWAYS"), false))
+            if(style.IsSameAs(wxT("PAGE-BREAK-BEFORE:ALWAYS"), false))
             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer()->InsertCell(new wxHtmlPageBreakCell);
@@ -298,7 +289,7 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
         if (winIface)
         {
             wxString title(tag.GetBeginIter(), tag.GetEndIter1());
-#if !wxUSE_UNICODE && wxUSE_WCHAR_T
+#if !wxUSE_UNICODE
             const wxFontEncoding enc = m_WParser->GetInputEncoding();
             if ( enc != wxFONTENCODING_DEFAULT )
             {
@@ -340,20 +331,17 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
         if ( !winIface )
             return false;
 
-        if (tag.HasParam(wxT("BACKGROUND")))
+        wxString bg;
+        if (tag.GetParamAsString(wxT("BACKGROUND"), &bg))
         {
-            wxFSFile *fileBgImage = m_WParser->OpenURL
-                                               (
-                                                wxHTML_URL_IMAGE,
-                                                tag.GetParam(wxT("BACKGROUND"))
-                                               );
+            wxFSFile *fileBgImage = m_WParser->OpenURL(wxHTML_URL_IMAGE, bg);
             if ( fileBgImage )
             {
                 wxInputStream *is = fileBgImage->GetStream();
                 if ( is )
                 {
                     wxImage image(*is);
-                    if ( image.Ok() )
+                    if ( image.IsOk() )
                         winIface->SetHTMLBackgroundImage(image);
                 }
 
@@ -364,7 +352,7 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
         if (tag.GetParamAsColour(wxT("BGCOLOR"), &clr))
         {
             m_WParser->GetContainer()->InsertCell(
-                new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND));
+                new wxHtmlColourCell(clr, wxHTML_CLR_TRANSPARENT_BACKGROUND));
             winIface->SetHTMLBackgroundColour(clr);
         }