Warning fix.

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index c3ff5cd2c514fe11f0356d4a97692e33b515488a..13ef2c9ae6fc354d945fdd0d052db4d9976a6404 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -19,13 +19,13 @@
     #include "wx/intl.h"
     #include "wx/dc.h"
     #include "wx/log.h"
+    #include "wx/settings.h"
 #endif
 
 #include "wx/html/htmldefs.h"
 #include "wx/html/winpars.h"
 #include "wx/html/htmlwin.h"
 #include "wx/fontmap.h"
-#include "wx/settings.h"
 #include "wx/uri.h"
 
 
@@ -541,7 +541,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
     else
     {
 #ifndef __WXMAC__
-        // okay, let convert to ISO_8859-1, available always
+        // okay, let's convert to ISO_8859-1, available always
         m_OutputEnc = wxFONTENCODING_DEFAULT;
 #else
         m_OutputEnc = wxLocale::GetSystemEncoding() ;
@@ -561,7 +561,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
                            (m_OutputEnc == wxFONTENCODING_DEFAULT) ?
                                       wxFONTENCODING_ISO8859_1 : m_OutputEnc,
                            wxCONVERT_SUBSTITUTE))
-    { // total failture :-(
+    { // total failure :-(
         wxLogError(_("Failed to display HTML document in %s encoding"),
                    wxFontMapper::GetEncodingName(enc).c_str());
         m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;