Remove unnecessary TranslateBookFlag() from the notebook sample.

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 9deb4545c0d33cf5b054ec12ba50a4f4c1b19afb..d7047133c397e91a6538c05d4625e4209bb6693a 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -573,11 +573,15 @@ void wxHtmlWinParser::SetFontPointSize(int pt)
         {
             if ( (pt > m_FontsSizes[n]) && (pt <= m_FontsSizes[n + 1]) )
             {
         {
             if ( (pt > m_FontsSizes[n]) && (pt <= m_FontsSizes[n + 1]) )
             {

-                // In this range, find out which entry it is closest to
-                if ( (pt - m_FontsSizes[n]) < (m_FontsSizes[n + 1] - pt) )
-                    m_FontSize = n;
-                else
-                    m_FontSize = n + 1;
+                if ( (pt - m_FontsSizes[n]) >= (m_FontsSizes[n + 1] - pt) )
+                {
+                    // The actual size is closer to the next entry than to this
+                    // one, so use it.
+                    n++;
+                }
+
+                // Notice that m_FontSize starts from 1, hence +1 here.
+                m_FontSize = n + 1;

 
                 break;
             }
 
                 break;
             }


@@ -606,8 +610,7 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
 #endif
                             ))
     {
 #endif
                             ))
     {

-        delete *fontptr;
-        *fontptr = NULL;
+        wxDELETE(*fontptr);

     }
 
     if (*fontptr == NULL)
     }
 
     if (*fontptr == NULL)


@@ -669,11 +672,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
     m_nbsp = 0;
 
     m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
     m_nbsp = 0;
 
     m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;

-    if (m_EncConv)
-    {
-        delete m_EncConv;
-        m_EncConv = NULL;
-    }
+    wxDELETE(m_EncConv);

 
     if (enc == wxFONTENCODING_DEFAULT)
         return;
 
     if (enc == wxFONTENCODING_DEFAULT)
         return;


@@ -738,8 +737,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
         wxLogError(_("Failed to display HTML document in %s encoding"),
                    wxFontMapper::GetEncodingName(enc).c_str());
         m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
         wxLogError(_("Failed to display HTML document in %s encoding"),
                    wxFontMapper::GetEncodingName(enc).c_str());
         m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;

-        delete m_EncConv;
-        m_EncConv = NULL;
+        wxDELETE(m_EncConv);

     }
 }
 #endif
     }
 }
 #endif