Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 01:30:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

pywxrc: fix Menu with variable name and label defined after sub-menus

Browse Source 
If the XRC looked like:
<object class="wxMenu" name="menu_file">
  <object class="wxMenuItem" name="menu_item_open">
    <label>Save</label>
  </object>
  <label>File</label>
</object>

The generated code would fail, because it would try to look for a main menu called "Save"
instead of looking for "File".

=> Make the XML parsing more clever to not look for the first "label" tag,
but the first _direct_ child with tag "label".
This commit is contained in:
Éric Piel
2018-08-22 13:51:16 +02:00
parent 984a036d34
commit 96ed353b34
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
wx/tools/pywxrc.py
View File

@@ -396,7 +396,10 @@ class XmlResourceCompiler:
if widgetClass == "MenuItem":
outputList.append(self.templates.MENUBAR_MENUITEM_VAR % locals())
elif widgetClass == "Menu":
label = widget.getElementsByTagName("label")[0]
for e in widget.childNodes:
if e.nodeType == e.ELEMENT_NODE and e.tagName == "label":
label = e
break
label = label.childNodes[0].data
outputList.append(self.templates.MENUBAR_MENU_VAR % locals())
else:
@@ -420,7 +423,10 @@ class XmlResourceCompiler:
if widgetClass == "MenuItem":
outputList.append(self.templates.MENU_MENUITEM_VAR % locals())
elif widgetClass == "Menu":
label = widget.getElementsByTagName("label")[0]
for e in widget.childNodes:
if e.nodeType == e.ELEMENT_NODE and e.tagName == "label":
label = e
break
label = label.childNodes[0].data
outputList.append(self.templates.MENU_MENU_VAR % locals())
else:
@@ -465,22 +471,26 @@ class XmlResourceCompiler:
widgetName = widget.getAttribute("name")
if widgetName != "" and widgetClass != "":
vars.append(widgetName)
if widgetClass not in \
['tool', 'unknown', 'notebookpage', 'separator',
'sizeritem', 'Menu', 'MenuBar', 'MenuItem']:
outputList.append(self.templates.CREATE_WIDGET_VAR % locals())
elif widgetClass == "MenuBar":
if widgetClass == "MenuBar":
outputList.append(self.templates.FRAME_MENUBAR_VAR % locals())
elif widgetClass == "MenuItem":
outputList.append(self.templates.FRAME_MENUBAR_MENUITEM_VAR % locals())
elif widgetClass == "Menu":
label = widget.getElementsByTagName("label")[0]
# Only look directly under for the "label"
for e in widget.childNodes:
if e.nodeType == e.ELEMENT_NODE and e.tagName == "label":
label = e
break
label = label.childNodes[0].data
outputList.append(self.templates.FRAME_MENUBAR_MENU_VAR % locals())
elif widgetClass == "ToolBar":
outputList.append(self.templates.FRAME_TOOLBAR_VAR % locals())
# elif widgetClass == "ToolBar":
# outputList.append(self.templates.FRAME_TOOLBAR_VAR % locals())
elif widgetClass == "tool":
outputList.append(self.templates.FRAME_TOOLBAR_TOOL_VAR % locals())
elif widgetClass in ('unknown', 'notebookpage', 'separator', 'sizeritem'):
pass
else:
outputList.append(self.templates.CREATE_WIDGET_VAR % locals())
return outputList