Lots of tweaks and additions to get caught up with CVS HEAD

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

wxPython/wx/tools/pywxrc.py

@@ -298,6 +298,9 @@ class XmlResApp:
         if node.GetName() == "bitmap":
             return True
 
+        if node.GetName() == "icon":
+            return True
+
         # URLs in wxHtmlWindow:
         if node.GetName() == "url":
             return True