Only call Select within SetString when internal data has been restored,

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 2e6fb654e792ccb9d73340262c9b6dffd005f7bf..0f7ee8027cf0aab0573417af525cfb481c3b993a 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -31,12 +31,14 @@
 #include "wx/html/htmlwin.h"
 #include "wx/fontmap.h"
 #include "wx/log.h"
 #include "wx/html/htmlwin.h"
 #include "wx/fontmap.h"
 #include "wx/log.h"

+#include "wx/settings.h"

 
 
 //-----------------------------------------------------------------------------
 // wxHtmlWinParser
 //-----------------------------------------------------------------------------
 
 
 
 //-----------------------------------------------------------------------------
 // wxHtmlWinParser
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinParser, wxHtmlParser)

 
 wxList wxHtmlWinParser::m_Modules;
 
 
 wxList wxHtmlWinParser::m_Modules;
 


@@ -187,8 +189,11 @@ void wxHtmlWinParser::InitParser(const wxString& source)
 #endif
 
     m_Container->InsertCell(new wxHtmlColourCell(m_ActualColor));
 #endif
 
     m_Container->InsertCell(new wxHtmlColourCell(m_ActualColor));

+    wxColour windowColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ;

     m_Container->InsertCell(
     m_Container->InsertCell(

-            new wxHtmlColourCell(GetWindow()->GetBackgroundColour(),
+            new wxHtmlColourCell(GetWindow() ?
+                                     GetWindow()->GetBackgroundColour() :
+                                     windowColour,

                                  wxHTML_CLR_BACKGROUND));
     m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont()));
 }
                                  wxHTML_CLR_BACKGROUND));
     m_Container->InsertCell(new wxHtmlFontCell(CreateCurrentFont()));
 }


@@ -463,9 +468,15 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
     else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE))
         m_OutputEnc = altnorm;
 
     else if (wxFontMapper::Get()->GetAltForEncoding(enc, &altnorm, m_FontFaceNormal, FALSE))
         m_OutputEnc = altnorm;
 

-    // okay, let convert to ISO_8859-1, available always

     else
     else

+    {
+#ifndef __WXMAC__
+        // okay, let convert to ISO_8859-1, available always

         m_OutputEnc = wxFONTENCODING_DEFAULT;
         m_OutputEnc = wxFONTENCODING_DEFAULT;

+#else
+        m_OutputEnc = wxLocale::GetSystemEncoding() ;
+#endif
+    }

 
     m_InputEnc = enc;
     if (m_OutputEnc == wxFONTENCODING_DEFAULT)
 
     m_InputEnc = enc;
     if (m_OutputEnc == wxFONTENCODING_DEFAULT)