X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/999d9a9f795cfc745681989ae0f30e531cde059f..0d1dff0172e94487c4aa2d830c714f93be73c7ec:/contrib/utils/wxrcedit/editor.cpp?ds=inline diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp index cb9a3e8e26..affbc9e01b 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, wxLocale::GetSystemEncodingName())) { delete m_Resource; m_Resource = NULL;