Updates from Eli
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d6d222febb
commit
9389458452
@ -1257,7 +1257,7 @@ class PythonOptions(wx.Dialog):
|
|||||||
if self.cfg.Read("filename", "") != "":
|
if self.cfg.Read("filename", "") != "":
|
||||||
self.FileNameTC.SetValue(self.cfg.Read("filename"))
|
self.FileNameTC.SetValue(self.cfg.Read("filename"))
|
||||||
else:
|
else:
|
||||||
name = os.path.splitext(dataFile)[0]
|
name = os.path.splitext(os.path.split(dataFile)[1])[0]
|
||||||
name += '_xrc.py'
|
name += '_xrc.py'
|
||||||
self.FileNameTC.SetValue(name)
|
self.FileNameTC.SetValue(name)
|
||||||
self.AutoGenerateCB.SetValue(self.cfg.ReadBool("autogenerate", False))
|
self.AutoGenerateCB.SetValue(self.cfg.ReadBool("autogenerate", False))
|
||||||
|
@ -227,7 +227,7 @@ class XmlResourceCompiler:
|
|||||||
windowClass = re.sub("^wx", "", windowClass)
|
windowClass = re.sub("^wx", "", windowClass)
|
||||||
windowName = topWindow.getAttribute("name")
|
windowName = topWindow.getAttribute("name")
|
||||||
|
|
||||||
if windowClass == "Menu":
|
if windowClass in ["Menu", "MenuItem"]:
|
||||||
outputList.append(self.templates.MENU_CLASS_HEADER % locals())
|
outputList.append(self.templates.MENU_CLASS_HEADER % locals())
|
||||||
else:
|
else:
|
||||||
outputList.append(self.templates.CLASS_HEADER % locals())
|
outputList.append(self.templates.CLASS_HEADER % locals())
|
||||||
|
Loading…
Reference in New Issue
Block a user