Explicitly set "C" locale for the tests using decimal point.

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

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 7eddd4a9433203c0e8877eedbec33d2606580099..b373e85a9d3bbc23b580351b8cd4ae5d0488facd 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -79,18 +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"
-{
-    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
 {
     // 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.


@@ -119,11 +110,7 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, wxArrayInt& known_page
 
 
     // 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)


@@ -298,7 +285,7 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
         if (winIface)
         {
             wxString title(tag.GetBeginIter(), tag.GetEndIter1());
         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 )
             {
             const wxFontEncoding enc = m_WParser->GetInputEncoding();
             if ( enc != wxFONTENCODING_DEFAULT )
             {