From: Václav Slavík <vslavik@fastmail.fm> Date: Sun, 27 Jan 2002 23:40:57 +0000 (+0000) Subject: use correct encoding in wxrcedit X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/20e453de9b64ff01a0a418f885c755db001481c6 use correct encoding in wxrcedit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp index cb9a3e8e26..201c047d72 100644 --- a/contrib/utils/wxrcedit/editor.cpp +++ b/contrib/utils/wxrcedit/editor.cpp @@ -145,7 +145,7 @@ enum ID_NEWMENU, ID_NEWMENUBAR, ID_NEWTOOLBAR, - ID_NEWNODE = wxID_HIGHEST + 10000, // safely out of XMLID range :) + ID_NEWNODE = wxID_HIGHEST + 10000, // safely out of XRCID range :) ID_NEWSYBNODE = ID_NEWNODE + 20000 }; @@ -297,7 +297,7 @@ void EditorFrame::LoadFile(const wxString& filename) m_Resource = new wxXmlRcEditDocument; m_Modified = FALSE; - if (!m_Resource->Load(filename)) + if (!m_Resource->Load(filename, wxXML_IO_AUTO, wxLocale::GetSystemEncodingName())) { delete m_Resource; m_Resource = NULL;