X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3485a4eef3a3fb03f8a12784d6b35bb68471ea0..87bf626584b14a57f9da0eee0d43a60ab6661301:/src/html/m_layout.cpp diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index 9b9b8d25de..02d38228cd 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -79,15 +79,9 @@ 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" 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. @@ -116,11 +110,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)