X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fe9c32957672a7b5cc21f9b62b12861e19e51a5..e6c46ffefb1c6875e2afe0fce9823b254bdb40ea:/wxPython/wx/tools/XRCed/xrced.py

diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py
index e4614d4dea..e47b62f287 100644
--- a/wxPython/wx/tools/XRCed/xrced.py
+++ b/wxPython/wx/tools/XRCed/xrced.py
@@ -373,6 +373,8 @@ class Frame(wx.Frame):
                                wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR)
             if dlg.ShowModal() == wx.ID_OK:
                 path = dlg.GetPath()
+                if isinstance(path, unicode):
+                    path = path.encode(sys.getfilesystemencoding())
                 dlg.Destroy()
             else:
                 dlg.Destroy()
@@ -1257,7 +1259,7 @@ class PythonOptions(wx.Dialog):
         if self.cfg.Read("filename", "") != "":
             self.FileNameTC.SetValue(self.cfg.Read("filename"))
         else:
-            name = os.path.splitext(dataFile)[0]
+            name = os.path.splitext(os.path.split(dataFile)[1])[0]
             name += '_xrc.py'
             self.FileNameTC.SetValue(name)
         self.AutoGenerateCB.SetValue(self.cfg.ReadBool("autogenerate", False))