Make the wxComboCtrl's wxTextEntry interface more complete and consistent. All text...

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

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 58384fb59922bc3edc4df66b435742915c43f4f6..b373e85a9d3bbc23b580351b8cd4ae5d0488facd 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -15,7 +15,7 @@
 
 #if wxUSE_HTML && wxUSE_STREAMS
 
 
 #if wxUSE_HTML && wxUSE_STREAMS
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP

     #include "wx/image.h"
 #endif
 
     #include "wx/image.h"
 #endif
 


@@ -79,15 +79,9 @@ public:
               wxHtmlRenderingInfo& WXUNUSED(info)) {}
 
 private:
               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" 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
 {
     // When we are counting pages, 'known_pagebreaks' is non-NULL.
 bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_pagebreaks) const
 {
     // When we are counting pages, 'known_pagebreaks' is non-NULL.


@@ -100,7 +94,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.
     // 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;
     }
     {
         return false;
     }


@@ -108,14 +102,15 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_page
     // m_PosY is only the vertical offset from the parent. The pagebreak
     // required here is the total page offset, so m_PosY must be added
     // to the parent's offset and height.
     // m_PosY is only the vertical offset from the parent. The pagebreak
     // required here is the total page offset, so m_PosY must be added
     // to the parent's offset and height.

-    int total_height = m_PosY + GetParent()->GetPosY() + GetParent()->GetHeight();
+    int total_height = m_PosY;
+    for ( wxHtmlCell *parent = GetParent(); parent; parent = parent->GetParent() )
+    {
+        total_height += parent->GetPosY();
+    }
+

 
     // Search the array of pagebreaks to see whether we've already set
 
     // 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)
     int where = known_pagebreaks.Index( total_height);
     // Add a pagebreak only if there isn't one already set here.
     if( wxNOT_FOUND != where)


@@ -289,10 +284,8 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
         wxHtmlWindowInterface *winIface = m_WParser->GetWindowInterface();
         if (winIface)
         {
         wxHtmlWindowInterface *winIface = m_WParser->GetWindowInterface();
         if (winIface)
         {

-            wxString title = m_WParser->GetSource()->Mid(
-                                    tag.GetBeginPos(),
-                                    tag.GetEndPos1()-tag.GetBeginPos());
-#if !wxUSE_UNICODE && wxUSE_WCHAR_T
+            wxString title(tag.GetBeginIter(), tag.GetEndIter1());
+#if !wxUSE_UNICODE

             const wxFontEncoding enc = m_WParser->GetInputEncoding();
             if ( enc != wxFONTENCODING_DEFAULT )
             {
             const wxFontEncoding enc = m_WParser->GetInputEncoding();
             if ( enc != wxFONTENCODING_DEFAULT )
             {