fixes for several fatal problems when using wxComboCtrl as popup (patch 1539124)

[wxWidgets.git] / wxPython / wxPython / xrc.py

diff --git a/wxPython/wxPython/xrc.py b/wxPython/wxPython/xrc.py
index 222c3f0aeb1b1c30a58c0e43cb07f07375e8a688..bb32df8c94db766cc5e2ed1c76c78afbad111859 100644 (file)
--- a/wxPython/wxPython/xrc.py
+++ b/wxPython/wxPython/xrc.py
@@ -1,7 +1,7 @@
 ## This file reverse renames symbols in the wx package to give
 ## them their wx prefix again, for backwards compatibility.
 ##
 ## This file reverse renames symbols in the wx package to give
 ## them their wx prefix again, for backwards compatibility.
 ##

-## Generated by ./distrib/build_renamers.py
+## Generated by BuildRenamers in config.py

 
 # This silly stuff here is so the wxPython.wx module doesn't conflict
 # with the wx package.  We need to import modules from the wx package
 
 # This silly stuff here is so the wxPython.wx module doesn't conflict
 # with the wx package.  We need to import modules from the wx package


@@ -32,15 +32,15 @@ WX_XMLRES_CURRENT_VERSION_RELEASE = wx.xrc.WX_XMLRES_CURRENT_VERSION_RELEASE
 WX_XMLRES_CURRENT_VERSION_REVISION = wx.xrc.WX_XMLRES_CURRENT_VERSION_REVISION
 wxXRC_USE_LOCALE = wx.xrc.XRC_USE_LOCALE
 wxXRC_NO_SUBCLASSING = wx.xrc.XRC_NO_SUBCLASSING
 WX_XMLRES_CURRENT_VERSION_REVISION = wx.xrc.WX_XMLRES_CURRENT_VERSION_REVISION
 wxXRC_USE_LOCALE = wx.xrc.XRC_USE_LOCALE
 wxXRC_NO_SUBCLASSING = wx.xrc.XRC_NO_SUBCLASSING

+wxXRC_NO_RELOADING = wx.xrc.XRC_NO_RELOADING

 wxXmlResource = wx.xrc.XmlResource
 wxXmlResource = wx.xrc.XmlResource

-wxXmlResourcePtr = wx.xrc.XmlResourcePtr

 wxEmptyXmlResource = wx.xrc.EmptyXmlResource
 wxXmlResource_AddSubclassFactory = wx.xrc.XmlResource_AddSubclassFactory
 wxXmlResource_GetXRCID = wx.xrc.XmlResource_GetXRCID
 wxXmlResource_Get = wx.xrc.XmlResource_Get
 wxXmlResource_Set = wx.xrc.XmlResource_Set
 wxXmlSubclassFactory = wx.xrc.XmlSubclassFactory
 wxEmptyXmlResource = wx.xrc.EmptyXmlResource
 wxXmlResource_AddSubclassFactory = wx.xrc.XmlResource_AddSubclassFactory
 wxXmlResource_GetXRCID = wx.xrc.XmlResource_GetXRCID
 wxXmlResource_Get = wx.xrc.XmlResource_Get
 wxXmlResource_Set = wx.xrc.XmlResource_Set
 wxXmlSubclassFactory = wx.xrc.XmlSubclassFactory

-wxXmlSubclassFactoryPtr = wx.xrc.XmlSubclassFactoryPtr
+wxXmlSubclassFactory = wx.xrc.XmlSubclassFactory

 wxXML_ELEMENT_NODE = wx.xrc.XML_ELEMENT_NODE
 wxXML_ATTRIBUTE_NODE = wx.xrc.XML_ATTRIBUTE_NODE
 wxXML_TEXT_NODE = wx.xrc.XML_TEXT_NODE
 wxXML_ELEMENT_NODE = wx.xrc.XML_ELEMENT_NODE
 wxXML_ATTRIBUTE_NODE = wx.xrc.XML_ATTRIBUTE_NODE
 wxXML_TEXT_NODE = wx.xrc.XML_TEXT_NODE


@@ -55,16 +55,13 @@ wxXML_DOCUMENT_FRAG_NODE = wx.xrc.XML_DOCUMENT_FRAG_NODE
 wxXML_NOTATION_NODE = wx.xrc.XML_NOTATION_NODE
 wxXML_HTML_DOCUMENT_NODE = wx.xrc.XML_HTML_DOCUMENT_NODE
 wxXmlProperty = wx.xrc.XmlProperty
 wxXML_NOTATION_NODE = wx.xrc.XML_NOTATION_NODE
 wxXML_HTML_DOCUMENT_NODE = wx.xrc.XML_HTML_DOCUMENT_NODE
 wxXmlProperty = wx.xrc.XmlProperty

-wxXmlPropertyPtr = wx.xrc.XmlPropertyPtr

 wxXmlNode = wx.xrc.XmlNode
 wxXmlNode = wx.xrc.XmlNode

-wxXmlNodePtr = wx.xrc.XmlNodePtr

 wxXmlNodeEasy = wx.xrc.XmlNodeEasy
 wxXmlDocument = wx.xrc.XmlDocument
 wxXmlNodeEasy = wx.xrc.XmlNodeEasy
 wxXmlDocument = wx.xrc.XmlDocument

-wxXmlDocumentPtr = wx.xrc.XmlDocumentPtr

 wxXmlDocumentFromStream = wx.xrc.XmlDocumentFromStream
 wxEmptyXmlDocument = wx.xrc.EmptyXmlDocument
 wxXmlResourceHandler = wx.xrc.XmlResourceHandler
 wxXmlDocumentFromStream = wx.xrc.XmlDocumentFromStream
 wxEmptyXmlDocument = wx.xrc.EmptyXmlDocument
 wxXmlResourceHandler = wx.xrc.XmlResourceHandler

-wxXmlResourceHandlerPtr = wx.xrc.XmlResourceHandlerPtr
+wxXmlResourceHandler = wx.xrc.XmlResourceHandler

 XRCID   = wx.xrc.XRCID
 XRCCTRL = wx.xrc.XRCCTRL
 wxTheXmlResource = wx.xrc.TheXmlResource
 XRCID   = wx.xrc.XRCID
 XRCCTRL = wx.xrc.XRCCTRL
 wxTheXmlResource = wx.xrc.TheXmlResource