Merged the wxPy_newswig branch into the HEAD branch (main trunk)

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

wxPython/wx/lib/editor/images.py

@@ -1,8 +1,27 @@
 
-"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+# images converted with wxPython's img2py.py tool
+
+from wxPython.wx import wxImageFromStream, wxBitmapFromImage
+import cStringIO
+
+##----------- Common Functions
+
+def GetBitmap(ImageData):
+    return wxBitmapFromImage(GetImage(ImageData))
+
+def GetImage(ImageData):
+    stream = cStringIO.StringIO(ImageData)
+    return wxImageFromStream(stream)
+
+##----------- Image Data
+
+EofImageData = \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x07\x00\x00\x00\x07\x08\x06\
+\x00\x00\x00\xc4RW\xd3\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00:IDATx\x9c]\x8e\xc1\r\x000\x08\x02\xc5\tn\xff)\xdd\xa0}\xd1`\xf9(\x9c\t\
+\n(kf\x0e \xfbN\x90\xf3\xc1\x0c\xd2\xab\xaa\x16Huv\xa4\x00\xb5\x97\x1f\xac\
+\x87\x1c\xe4\xe1\x05`2\x15\x9e\xc54\xca\xb4\x00\x00\x00\x00IEND\xaeB`\x82'
+
+
+
 
-from wx import _rename
-from wxPython.lib.editor import images
-_rename(globals(), images.__dict__, modulename='lib.editor.images')
-del images
-del _rename