wxX11:

[wxWidgets.git] / contrib / utils / wxrcedit / editor.cpp

diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp
index cb9a3e8e2696821a7d80b3768ab04d0a7ee12eb5..affbc9e01bcd7b614db6c55851fa3d9ca8f88e45 100644 (file)
--- a/contrib/utils/wxrcedit/editor.cpp
+++ b/contrib/utils/wxrcedit/editor.cpp
@@ -145,7 +145,7 @@ enum
     ID_NEWMENU,
     ID_NEWMENUBAR,
     ID_NEWTOOLBAR,   
     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
 };
 
     ID_NEWSYBNODE = ID_NEWNODE + 20000
 };
 


@@ -297,7 +297,7 @@ void EditorFrame::LoadFile(const wxString& filename)
     m_Resource = new wxXmlRcEditDocument;
     m_Modified = FALSE;
     
     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;
     {
         delete m_Resource;
         m_Resource = NULL;