From 9389458452c806130c8c014509897768e45ae155 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 20 Aug 2006 05:09:17 +0000 Subject: [PATCH] Updates from Eli git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/wx/tools/XRCed/xrced.py | 2 +- wxPython/wx/tools/pywxrc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py index e4614d4dea..f4ad0cfcfa 100644 --- a/wxPython/wx/tools/XRCed/xrced.py +++ b/wxPython/wx/tools/XRCed/xrced.py @@ -1257,7 +1257,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)) diff --git a/wxPython/wx/tools/pywxrc.py b/wxPython/wx/tools/pywxrc.py index 997e2b81d0..9093b2e125 100644 --- a/wxPython/wx/tools/pywxrc.py +++ b/wxPython/wx/tools/pywxrc.py @@ -227,7 +227,7 @@ class XmlResourceCompiler: windowClass = re.sub("^wx", "", windowClass) windowName = topWindow.getAttribute("name") - if windowClass == "Menu": + if windowClass in ["Menu", "MenuItem"]: outputList.append(self.templates.MENU_CLASS_HEADER % locals()) else: outputList.append(self.templates.CLASS_HEADER % locals()) -- 2.45.2