X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43ef6d9ec748053bd32d5e7c01084de3b09ea8af..0d1dff0172e94487c4aa2d830c714f93be73c7ec:/contrib/utils/wxrcedit/editor.cpp?ds=sidebyside

diff --git a/contrib/utils/wxrcedit/editor.cpp b/contrib/utils/wxrcedit/editor.cpp
index 3e6a50910b..affbc9e01b 100644
--- a/contrib/utils/wxrcedit/editor.cpp
+++ b/contrib/utils/wxrcedit/editor.cpp
@@ -19,8 +19,8 @@
 #endif
 
 #include "wx/wx.h"
-#include "wx/xml/xml.h"
-#include "wx/xml/xmlres.h"
+#include "wx/xrc/xml.h"
+#include "wx/xrc/xmlres.h"
 #include "wx/splitter.h"
 #include "wx/config.h"
 #include "wx/dir.h"
@@ -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;
@@ -354,7 +354,7 @@ void EditorFrame::RefreshTitle()
     wxString s;
     if (m_Modified) s << _T("* ");
     s << _("wxrcedit");
-    if (!m_FileName)
+    if (m_FileName != "")
         s << _T(" - ") << wxFileNameFromPath(m_FileName);
     SetTitle(s);
 }