Correct a print format specifier mismatch in wxFileConfig::Parse().

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 9b5adbdfb17dfff7824b924963a9e6d35c253ffb..916c43a989e9652b70b707ff60a69e24e583de86 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -202,7 +202,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
     m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
     m_FontSize = 3; //default one
     CreateCurrentFont();           // we're selecting default font into
     m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
     m_FontSize = 3; //default one
     CreateCurrentFont();           // we're selecting default font into

-    
+

     // we're not using GetCharWidth/Height() because of
     // differences under X and win
     wxCoord w,h;
     // we're not using GetCharWidth/Height() because of
     // differences under X and win
     wxCoord w,h;


@@ -345,15 +345,18 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
     return GetFS()->OpenFile(myurl, flags);
 }
 
     return GetFS()->OpenFile(myurl, flags);
 }
 

+#define NBSP_UNICODE_VALUE  (wxChar(160))
+#if !wxUSE_UNICODE
+    #define CUR_NBSP_VALUE m_nbsp
+#else
+    #define CUR_NBSP_VALUE NBSP_UNICODE_VALUE
+#endif
+

 void wxHtmlWinParser::AddText(const wxString& txt)
 {
 void wxHtmlWinParser::AddText(const wxString& txt)
 {

-    #define NBSP_UNICODE_VALUE  (wxChar(160))

 #if !wxUSE_UNICODE
     if ( m_nbsp == 0 )
         m_nbsp = GetEntitiesParser()->GetCharForCode(NBSP_UNICODE_VALUE);
 #if !wxUSE_UNICODE
     if ( m_nbsp == 0 )
         m_nbsp = GetEntitiesParser()->GetCharForCode(NBSP_UNICODE_VALUE);

-    #define CUR_NBSP_VALUE m_nbsp
-#else
-    #define CUR_NBSP_VALUE NBSP_UNICODE_VALUE

 #endif
 
     if ( m_whitespaceMode == Whitespace_Normal )
 #endif
 
     if ( m_whitespaceMode == Whitespace_Normal )


@@ -385,7 +388,7 @@ void wxHtmlWinParser::AddText(const wxString& txt)
         while (i < end)
         {
             size_t x = 0;
         while (i < end)
         {
             size_t x = 0;

-            wxChar d = *i;
+            const wxChar d = temp[templen++] = *i;

             if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
             {
                 ++i, ++x;
             if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
             {
                 ++i, ++x;


@@ -402,11 +405,6 @@ void wxHtmlWinParser::AddText(const wxString& txt)
                 ++i;
             }
 
                 ++i;
             }
 

-            if (d == CUR_NBSP_VALUE)
-                d = ' ';
-
-            temp[templen++] = d;
-

             if (x)
             {
                 temp[templen-1] = wxT(' ');
             if (x)
             {
                 temp[templen-1] = wxT(' ');


@@ -445,6 +443,12 @@ void wxHtmlWinParser::FlushWordBuf(wxChar *buf, int& len)
 {
     buf[len] = 0;
 
 {
     buf[len] = 0;
 

+    for ( int i = 0; i < len; i++ )
+    {
+        if ( buf[i] == CUR_NBSP_VALUE )
+            buf[i] = ' ';
+    }
+

 #if !wxUSE_UNICODE
     if (m_EncConv)
         m_EncConv->Convert(buf);
 #if !wxUSE_UNICODE
     if (m_EncConv)
         m_EncConv->Convert(buf);


@@ -473,7 +477,6 @@ void wxHtmlWinParser::AddPreBlock(const wxString& text)
 
         const wxString::const_iterator end = text.end();
         wxString::const_iterator copyFrom = text.begin();
 
         const wxString::const_iterator end = text.end();
         wxString::const_iterator copyFrom = text.begin();

-        size_t posFrom = 0;

         size_t pos = 0;
         int posColumn = m_posColumn;
         for ( wxString::const_iterator i = copyFrom; i != end; ++i, ++pos )
         size_t pos = 0;
         int posColumn = m_posColumn;
         for ( wxString::const_iterator i = copyFrom; i != end; ++i, ++pos )


@@ -489,7 +492,6 @@ void wxHtmlWinParser::AddPreBlock(const wxString& text)
 
                 posColumn += expandTo;
                 copyFrom = i + 1;
 
                 posColumn += expandTo;
                 copyFrom = i + 1;

-                posFrom = pos + 1;

             }
             else
             {
             }
             else
             {


@@ -550,6 +552,38 @@ void wxHtmlWinParser::SetFontSize(int s)
 }
 
 
 }
 
 

+void wxHtmlWinParser::SetDC(wxDC *dc, double pixel_scale, double font_scale)
+{
+    m_DC = dc;
+    m_PixelScale = pixel_scale;
+    m_FontScale = font_scale;
+}
+
+void wxHtmlWinParser::SetFontPointSize(int pt)
+{
+    if (pt <= m_FontsSizes[0])
+        m_FontSize = 1;
+    else if (pt >= m_FontsSizes[6])
+        m_FontSize = 7;
+    else
+    {
+        // Find the font closest to the given value with a simple linear search
+        // (binary search is not worth it here for so small number of elements)
+        for ( int n = 0; n < 6; n++ )
+        {
+            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;
+
+                break;
+            }
+        }
+    }
+}

 
 wxFont* wxHtmlWinParser::CreateCurrentFont()
 {
 
 wxFont* wxHtmlWinParser::CreateCurrentFont()
 {


@@ -572,15 +606,14 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
 #endif
                             ))
     {
 #endif
                             ))
     {

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

     }
 
     if (*fontptr == NULL)
     {
         *faceptr = face;
         *fontptr = new wxFont(
     }
 
     if (*fontptr == NULL)
     {
         *faceptr = face;
         *fontptr = new wxFont(

-                       (int) (m_FontsSizes[fs] * m_PixelScale),
+                       (int) (m_FontsSizes[fs] * m_FontScale),

                        ff ? wxMODERN : wxSWISS,
                        fi ? wxITALIC : wxNORMAL,
                        fb ? wxBOLD : wxNORMAL,
                        ff ? wxMODERN : wxSWISS,
                        fi ? wxITALIC : wxNORMAL,
                        fb ? wxBOLD : wxNORMAL,


@@ -635,11 +668,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;


@@ -704,8 +733,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