Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use font encoding

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-12-04 10:16:11 +00:00
parent 1dfeae4c13
commit 85d3d198c2
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/htmllbox.h
View File

@@ -74,10 +74,6 @@ public:
virtual void RefreshAll(); virtual void RefreshAll();
virtual void SetItemCount(size_t count); virtual void SetItemCount(size_t count);
// provide a way to set the default encoding (non-Unicode only)
void SetEncoding(wxFontEncoding encoding) { m_fontEncoding = encoding; }
wxFontEncoding GetEncoding() { return m_fontEncoding; }
#if wxUSE_FILESYSTEM #if wxUSE_FILESYSTEM
// retrieve the file system used by the wxHtmlWinParser: if you use // retrieve the file system used by the wxHtmlWinParser: if you use
// relative paths in your HTML, you should use its ChangePathTo() method // relative paths in your HTML, you should use its ChangePathTo() method
@@ -171,9 +167,6 @@ private:
// HTML parser we use // HTML parser we use
wxHtmlWinParser *m_htmlParser; wxHtmlWinParser *m_htmlParser;
// font encoding (used in non-Unicode mode only)
wxFontEncoding m_fontEncoding;
#if wxUSE_FILESYSTEM #if wxUSE_FILESYSTEM
// file system used by m_htmlParser // file system used by m_htmlParser
wxFileSystem m_filesystem; wxFileSystem m_filesystem;

4
src/generic/htmllbox.cpp
View File

@@ -225,7 +225,6 @@ void wxHtmlListBox::Init()
m_htmlParser = NULL; m_htmlParser = NULL;
m_htmlRendStyle = new wxHtmlListBoxStyle(*this); m_htmlRendStyle = new wxHtmlListBoxStyle(*this);
m_cache = new wxHtmlListBoxCache; m_cache = new wxHtmlListBoxCache;
m_fontEncoding = wxFONTENCODING_ISO8859_1;
} }
bool wxHtmlListBox::Create(wxWindow *parent, bool wxHtmlListBox::Create(wxWindow *parent,
@@ -295,7 +294,8 @@ void wxHtmlListBox::CacheItem(size_t n) const
m_htmlParser->SetDC(new wxClientDC(self)); m_htmlParser->SetDC(new wxClientDC(self));
m_htmlParser->SetFS(&self->m_filesystem); m_htmlParser->SetFS(&self->m_filesystem);
#if !wxUSE_UNICODE #if !wxUSE_UNICODE
m_htmlParser->SetInputEncoding(m_fontEncoding); if (GetFont().Ok())
m_htmlParser->SetInputEncoding(GetFont().GetEncoding());
#endif #endif
// use system's default GUI font by default: // use system's default GUI font by default:
m_htmlParser->SetStandardFonts(); m_htmlParser->SetStandardFonts();