Updates from Eli

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py
index e4614d4deac1bfeb9361977350f152b300e491e7..f4ad0cfcfa1708cbe66b36ddec32ea791b7b4e81 100644 (file)
--- 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 997e2b81d0e3889b2a9bd22f815c930fc576494d..9093b2e12591a64e78414a82f24c2b0a7b3e07e7 100644 (file)
--- 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())