Script updates

[wxWidgets.git] / wxPython / demo / throbImages.py

diff --git a/wxPython/demo/throbImages.py b/wxPython/demo/throbImages.py
index d68d85136b91da5197098119aba606345eeec26e..05b49caf20652e6537063e3bcf8c25d292816097 100644 (file)
--- a/wxPython/demo/throbImages.py
+++ b/wxPython/demo/throbImages.py
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------
 # This file was generated by encode_bitmaps.py
 #
 #----------------------------------------------------------------------
 # This file was generated by encode_bitmaps.py
 #

-from wxPython.wx import wxImageFromStream, wxBitmapFromImage
+from wx import ImageFromStream, BitmapFromImage

 import cStringIO
 
 
 import cStringIO
 
 


@@ -93,11 +93,11 @@ Ew@8\x87\xb1\x96\x18#\xfd\xd0\xd3u\x1e\xef\xf38\xb9\xf9\xfc\x07\x8c\x00\x9c\
 \xaeB`\x82' 
 
 def get001Bitmap():
 \xaeB`\x82' 
 
 def get001Bitmap():

-    return wxBitmapFromImage(get001Image())
+    return BitmapFromImage(get001Image())

 
 def get001Image():
     stream = cStringIO.StringIO(get001Data())
 
 def get001Image():
     stream = cStringIO.StringIO(get001Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('001')
 catalog['001'] = ImageClass()
 
 index.append('001')
 catalog['001'] = ImageClass()


@@ -189,11 +189,11 @@ P\x88\xf47\xbd\xbd\xaa\xac\x0e\xa5\xd8\x9b\xf4D\x04bO\x8a\x7f\xc7\x8b\x9a\
 \xbf\x01\xfc\t\xfa\\\xad\xe0v?\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get002Bitmap():
 \xbf\x01\xfc\t\xfa\\\xad\xe0v?\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get002Bitmap():

-    return wxBitmapFromImage(get002Image())
+    return BitmapFromImage(get002Image())

 
 def get002Image():
     stream = cStringIO.StringIO(get002Data())
 
 def get002Image():
     stream = cStringIO.StringIO(get002Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('002')
 catalog['002'] = ImageClass()
 
 index.append('002')
 catalog['002'] = ImageClass()


@@ -285,11 +285,11 @@ w\xaf\xb9\xbd\xbd\x89\x00\xba\xd8\x825M=#\x9bL\xf6^\xa1\x94\xc2y\x8f\xed:\
 \x8c/j\xfe\x0f\xd8\x1d\x10\x98\x84\xbe&\x9c\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get003Bitmap():
 \x8c/j\xfe\x0f\xd8\x1d\x10\x98\x84\xbe&\x9c\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get003Bitmap():

-    return wxBitmapFromImage(get003Image())
+    return BitmapFromImage(get003Image())

 
 def get003Image():
     stream = cStringIO.StringIO(get003Data())
 
 def get003Image():
     stream = cStringIO.StringIO(get003Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('003')
 catalog['003'] = ImageClass()
 
 index.append('003')
 catalog['003'] = ImageClass()


@@ -384,11 +384,11 @@ s\xfa\x9e}X\x91\xce\xd7\x98\xe9\x0cm\x14R\n\x9a\xa6a\xb5^RW\x15\xbb\xdd\xf6!\
 \xd6\xc47q\xb1o)\xe8\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get004Bitmap():
 \xd6\xc47q\xb1o)\xe8\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get004Bitmap():

-    return wxBitmapFromImage(get004Image())
+    return BitmapFromImage(get004Image())

 
 def get004Image():
     stream = cStringIO.StringIO(get004Data())
 
 def get004Image():
     stream = cStringIO.StringIO(get004Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('004')
 catalog['004'] = ImageClass()
 
 index.append('004')
 catalog['004'] = ImageClass()


@@ -489,11 +489,11 @@ T\xd3b\xb1\xc3l\xb6M\xd3\x94\xd4\xabK\xca\xb6\xa2<<\xc5\xe8)y\xe6p\x99K\x15W\
 \xa5^v\xc7\xab\xa1\x84<\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get005Bitmap():
 \xa5^v\xc7\xab\xa1\x84<\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get005Bitmap():

-    return wxBitmapFromImage(get005Image())
+    return BitmapFromImage(get005Image())

 
 def get005Image():
     stream = cStringIO.StringIO(get005Data())
 
 def get005Image():
     stream = cStringIO.StringIO(get005Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('005')
 catalog['005'] = ImageClass()
 
 index.append('005')
 catalog['005'] = ImageClass()


@@ -588,11 +588,11 @@ Gh\xcf\xf3=)~\x1b\x0fj\xfe\x0bA\xd9\\\x8cd\xf1*\x82\x00\x00\x00\x00IEND\xaeB\
 `\x82' 
 
 def get006Bitmap():
 `\x82' 
 
 def get006Bitmap():

-    return wxBitmapFromImage(get006Image())
+    return BitmapFromImage(get006Image())

 
 def get006Image():
     stream = cStringIO.StringIO(get006Data())
 
 def get006Image():
     stream = cStringIO.StringIO(get006Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('006')
 catalog['006'] = ImageClass()
 
 index.append('006')
 catalog['006'] = ImageClass()


@@ -685,11 +685,11 @@ t\xd1,\xcb\xf0\xde\xb7UQk\xdd\x86\xae\xeb\x95/\xff\xf5\x1f^\xbd9\xe3\xf5w\
 \x82' 
 
 def get007Bitmap():
 \x82' 
 
 def get007Bitmap():

-    return wxBitmapFromImage(get007Image())
+    return BitmapFromImage(get007Image())

 
 def get007Image():
     stream = cStringIO.StringIO(get007Data())
 
 def get007Image():
     stream = cStringIO.StringIO(get007Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('007')
 catalog['007'] = ImageClass()
 
 index.append('007')
 catalog['007'] = ImageClass()


@@ -784,11 +784,11 @@ y$JI\xb4R\xfc\xe9\xe3\xcfx\xfe\x9f\x01y\x9e\x93e\x19\xe7\xe7\xe7dYF\x96e|;Y`\
 \x01k)\xae\n\xd5\xf2\r\xdb\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get008Bitmap():
 \x01k)\xae\n\xd5\xf2\r\xdb\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get008Bitmap():

-    return wxBitmapFromImage(get008Image())
+    return BitmapFromImage(get008Image())

 
 def get008Image():
     stream = cStringIO.StringIO(get008Data())
 
 def get008Image():
     stream = cStringIO.StringIO(get008Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('008')
 catalog['008'] = ImageClass()
 
 index.append('008')
 catalog['008'] = ImageClass()


@@ -879,11 +879,11 @@ q\xf3\xe2%Y\xf6;\xeb\x8f+\x9a\xba@\x86\x03Z:dh\t\xde\x11\x82\xc5{\xd7Ys\xafY\
 \x05g\'\x93\xa3\xa4\x98\xbd\xac\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get009Bitmap():
 \x05g\'\x93\xa3\xa4\x98\xbd\xac\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get009Bitmap():

-    return wxBitmapFromImage(get009Image())
+    return BitmapFromImage(get009Image())

 
 def get009Image():
     stream = cStringIO.StringIO(get009Data())
 
 def get009Image():
     stream = cStringIO.StringIO(get009Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('009')
 catalog['009'] = ImageClass()
 
 index.append('009')
 catalog['009'] = ImageClass()


@@ -980,11 +980,11 @@ Ny\xf2\xdd9\xab\xb8\xecZ\xd3\xb6ll\xfb\x91\x86HH\xc1[\xef\xbeO\x9a\xa5\\\xcd\
 \x00IEND\xaeB`\x82' 
 
 def get010Bitmap():
 \x00IEND\xaeB`\x82' 
 
 def get010Bitmap():

-    return wxBitmapFromImage(get010Image())
+    return BitmapFromImage(get010Image())

 
 def get010Image():
     stream = cStringIO.StringIO(get010Data())
 
 def get010Image():
     stream = cStringIO.StringIO(get010Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('010')
 catalog['010'] = ImageClass()
 
 index.append('010')
 catalog['010'] = ImageClass()


@@ -1079,11 +1079,11 @@ Q\x14,\x96\x1b\xb6i\xc565\x18\xd7D@\xdc\x9c\xb7[\x0f\x1fj\xc4\xe3\x9d\xc7{\
 IEND\xaeB`\x82' 
 
 def get011Bitmap():
 IEND\xaeB`\x82' 
 
 def get011Bitmap():

-    return wxBitmapFromImage(get011Image())
+    return BitmapFromImage(get011Image())

 
 def get011Image():
     stream = cStringIO.StringIO(get011Data())
 
 def get011Image():
     stream = cStringIO.StringIO(get011Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('011')
 catalog['011'] = ImageClass()
 
 index.append('011')
 catalog['011'] = ImageClass()


@@ -1179,11 +1179,11 @@ UU\xe4yN\x9a\xa6\xa4i\xca2\xd9\xb4\x8dz\xa8H\xd0#\x1eNX.\xa7m\x83\xdd\x07QJa\
 \x00\x00\x00IEND\xaeB`\x82' 
 
 def get012Bitmap():
 \x00\x00\x00IEND\xaeB`\x82' 
 
 def get012Bitmap():

-    return wxBitmapFromImage(get012Image())
+    return BitmapFromImage(get012Image())

 
 def get012Image():
     stream = cStringIO.StringIO(get012Data())
 
 def get012Image():
     stream = cStringIO.StringIO(get012Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('012')
 catalog['012'] = ImageClass()
 
 index.append('012')
 catalog['012'] = ImageClass()


@@ -1280,11 +1280,11 @@ p\xb8i^W \xdbk\x16\x8b\x05\xdf\x9e^\xf0lVR,\x9a\xcd~\x86\xcdL\xbb\xdb\xbb6\
 \x1a\xd9\x15\x96\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get013Bitmap():
 \x1a\xd9\x15\x96\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get013Bitmap():

-    return wxBitmapFromImage(get013Image())
+    return BitmapFromImage(get013Image())

 
 def get013Image():
     stream = cStringIO.StringIO(get013Data())
 
 def get013Image():
     stream = cStringIO.StringIO(get013Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('013')
 catalog['013'] = ImageClass()
 
 index.append('013')
 catalog['013'] = ImageClass()


@@ -1378,11 +1378,11 @@ ny\xbf*Y\x17M\xbf\x9f\xa1\x9fi\x8f{W?\x8f\xdcG\xe3\xfe*\x88(\x9e~\xf1\x9c\
 \x0f\x14\xf5q\xf5\x0b9\xe5)\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get014Bitmap():
 \x0f\x14\xf5q\xf5\x0b9\xe5)\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get014Bitmap():

-    return wxBitmapFromImage(get014Image())
+    return BitmapFromImage(get014Image())

 
 def get014Image():
     stream = cStringIO.StringIO(get014Data())
 
 def get014Image():
     stream = cStringIO.StringIO(get014Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('014')
 catalog['014'] = ImageClass()
 
 index.append('014')
 catalog['014'] = ImageClass()


@@ -1480,11 +1480,11 @@ cgg\xa7\x1b#Z\x90\xcdk\xf2<\xe7\xcb\x93s\x9eN\x16L\xf3\xb2\x99g\x00\xd1(\xf3\
 \x81E\xc4\xf0\x00\x1c\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get015Bitmap():
 \x81E\xc4\xf0\x00\x1c\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get015Bitmap():

-    return wxBitmapFromImage(get015Image())
+    return BitmapFromImage(get015Image())

 
 def get015Image():
     stream = cStringIO.StringIO(get015Data())
 
 def get015Image():
     stream = cStringIO.StringIO(get015Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('015')
 catalog['015'] = ImageClass()
 
 index.append('015')
 catalog['015'] = ImageClass()


@@ -1579,11 +1579,11 @@ Gh\xcf\xf3=)~\x1b\x0fj\xfe\x0bA\xd9\\\x8cd\xf1*\x82\x00\x00\x00\x00IEND\xaeB\
 `\x82' 
 
 def get016Bitmap():
 `\x82' 
 
 def get016Bitmap():

-    return wxBitmapFromImage(get016Image())
+    return BitmapFromImage(get016Image())

 
 def get016Image():
     stream = cStringIO.StringIO(get016Data())
 
 def get016Image():
     stream = cStringIO.StringIO(get016Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('016')
 catalog['016'] = ImageClass()
 
 index.append('016')
 catalog['016'] = ImageClass()


@@ -1676,11 +1676,11 @@ t\xd1,\xcb\xf0\xde\xb7UQk\xdd\x86\xae\xeb\x95/\xff\xf5\x1f^\xbd9\xe3\xf5w\
 \x82' 
 
 def get017Bitmap():
 \x82' 
 
 def get017Bitmap():

-    return wxBitmapFromImage(get017Image())
+    return BitmapFromImage(get017Image())

 
 def get017Image():
     stream = cStringIO.StringIO(get017Data())
 
 def get017Image():
     stream = cStringIO.StringIO(get017Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('017')
 catalog['017'] = ImageClass()
 
 index.append('017')
 catalog['017'] = ImageClass()


@@ -1775,11 +1775,11 @@ y$JI\xb4R\xfc\xe9\xe3\xcfx\xfe\x9f\x01y\x9e\x93e\x19\xe7\xe7\xe7dYF\x96e|;Y`\
 \x01k)\xae\n\xd5\xf2\r\xdb\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get018Bitmap():
 \x01k)\xae\n\xd5\xf2\r\xdb\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get018Bitmap():

-    return wxBitmapFromImage(get018Image())
+    return BitmapFromImage(get018Image())

 
 def get018Image():
     stream = cStringIO.StringIO(get018Data())
 
 def get018Image():
     stream = cStringIO.StringIO(get018Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('018')
 catalog['018'] = ImageClass()
 
 index.append('018')
 catalog['018'] = ImageClass()


@@ -1870,11 +1870,11 @@ q\xf3\xe2%Y\xf6;\xeb\x8f+\x9a\xba@\x86\x03Z:dh\t\xde\x11\x82\xc5{\xd7Ys\xafY\
 \x05g\'\x93\xa3\xa4\x98\xbd\xac\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get019Bitmap():
 \x05g\'\x93\xa3\xa4\x98\xbd\xac\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get019Bitmap():

-    return wxBitmapFromImage(get019Image())
+    return BitmapFromImage(get019Image())

 
 def get019Image():
     stream = cStringIO.StringIO(get019Data())
 
 def get019Image():
     stream = cStringIO.StringIO(get019Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('019')
 catalog['019'] = ImageClass()
 
 index.append('019')
 catalog['019'] = ImageClass()


@@ -1971,11 +1971,11 @@ Ny\xf2\xdd9\xab\xb8\xecZ\xd3\xb6ll\xfb\x91\x86HH\xc1[\xef\xbeO\x9a\xa5\\\xcd\
 \x00IEND\xaeB`\x82' 
 
 def get020Bitmap():
 \x00IEND\xaeB`\x82' 
 
 def get020Bitmap():

-    return wxBitmapFromImage(get020Image())
+    return BitmapFromImage(get020Image())

 
 def get020Image():
     stream = cStringIO.StringIO(get020Data())
 
 def get020Image():
     stream = cStringIO.StringIO(get020Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('020')
 catalog['020'] = ImageClass()
 
 index.append('020')
 catalog['020'] = ImageClass()


@@ -2070,11 +2070,11 @@ Q\x14,\x96\x1b\xb6i\xc565\x18\xd7D@\xdc\x9c\xb7[\x0f\x1fj\xc4\xe3\x9d\xc7{\
 IEND\xaeB`\x82' 
 
 def get021Bitmap():
 IEND\xaeB`\x82' 
 
 def get021Bitmap():

-    return wxBitmapFromImage(get021Image())
+    return BitmapFromImage(get021Image())

 
 def get021Image():
     stream = cStringIO.StringIO(get021Data())
 
 def get021Image():
     stream = cStringIO.StringIO(get021Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('021')
 catalog['021'] = ImageClass()
 
 index.append('021')
 catalog['021'] = ImageClass()


@@ -2170,11 +2170,11 @@ UU\xe4yN\x9a\xa6\xa4i\xca2\xd9\xb4\x8dz\xa8H\xd0#\x1eNX.\xa7m\x83\xdd\x07QJa\
 \x00\x00\x00IEND\xaeB`\x82' 
 
 def get022Bitmap():
 \x00\x00\x00IEND\xaeB`\x82' 
 
 def get022Bitmap():

-    return wxBitmapFromImage(get022Image())
+    return BitmapFromImage(get022Image())

 
 def get022Image():
     stream = cStringIO.StringIO(get022Data())
 
 def get022Image():
     stream = cStringIO.StringIO(get022Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('022')
 catalog['022'] = ImageClass()
 
 index.append('022')
 catalog['022'] = ImageClass()


@@ -2271,11 +2271,11 @@ p\xb8i^W \xdbk\x16\x8b\x05\xdf\x9e^\xf0lVR,\x9a\xcd~\x86\xcdL\xbb\xdb\xbb6\
 \x1a\xd9\x15\x96\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get023Bitmap():
 \x1a\xd9\x15\x96\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get023Bitmap():

-    return wxBitmapFromImage(get023Image())
+    return BitmapFromImage(get023Image())

 
 def get023Image():
     stream = cStringIO.StringIO(get023Data())
 
 def get023Image():
     stream = cStringIO.StringIO(get023Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('023')
 catalog['023'] = ImageClass()
 
 index.append('023')
 catalog['023'] = ImageClass()


@@ -2369,11 +2369,11 @@ ny\xbf*Y\x17M\xbf\x9f\xa1\x9fi\x8f{W?\x8f\xdcG\xe3\xfe*\x88(\x9e~\xf1\x9c\
 \x0f\x14\xf5q\xf5\x0b9\xe5)\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get024Bitmap():
 \x0f\x14\xf5q\xf5\x0b9\xe5)\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get024Bitmap():

-    return wxBitmapFromImage(get024Image())
+    return BitmapFromImage(get024Image())

 
 def get024Image():
     stream = cStringIO.StringIO(get024Data())
 
 def get024Image():
     stream = cStringIO.StringIO(get024Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('024')
 catalog['024'] = ImageClass()
 
 index.append('024')
 catalog['024'] = ImageClass()


@@ -2471,11 +2471,11 @@ cgg\xa7\x1b#Z\x90\xcdk\xf2<\xe7\xcb\x93s\x9eN\x16L\xf3\xb2\x99g\x00\xd1(\xf3\
 \x81E\xc4\xf0\x00\x1c\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get025Bitmap():
 \x81E\xc4\xf0\x00\x1c\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get025Bitmap():

-    return wxBitmapFromImage(get025Image())
+    return BitmapFromImage(get025Image())

 
 def get025Image():
     stream = cStringIO.StringIO(get025Data())
 
 def get025Image():
     stream = cStringIO.StringIO(get025Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('025')
 catalog['025'] = ImageClass()
 
 index.append('025')
 catalog['025'] = ImageClass()


@@ -2569,11 +2569,11 @@ UQw\xa3i\xac\x08{\xa1\x01\x81\x90\x82\xf7?\xfc\x98\xb2*\xb9\xb8x\xbd7Y\xc5\
 \x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get026Bitmap():
 \x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get026Bitmap():

-    return wxBitmapFromImage(get026Image())
+    return BitmapFromImage(get026Image())

 
 def get026Image():
     stream = cStringIO.StringIO(get026Data())
 
 def get026Image():
     stream = cStringIO.StringIO(get026Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('026')
 catalog['026'] = ImageClass()
 
 index.append('026')
 catalog['026'] = ImageClass()


@@ -2666,11 +2666,11 @@ G$\xa6\xee\xcb\xe4\xfc\xed\xfd\xfa\xd2\x18;\xe2fu\xd6\xf7\x13\xd6\xda\xf6\
 \x8c\x175\xff\x03\x89\xa8;\xfaX\x82\xde\xe7\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get027Bitmap():
 \x8c\x175\xff\x03\x89\xa8;\xfaX\x82\xde\xe7\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get027Bitmap():

-    return wxBitmapFromImage(get027Image())
+    return BitmapFromImage(get027Image())

 
 def get027Image():
     stream = cStringIO.StringIO(get027Data())
 
 def get027Image():
     stream = cStringIO.StringIO(get027Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('027')
 catalog['027'] = ImageClass()
 
 index.append('027')
 catalog['027'] = ImageClass()


@@ -2771,11 +2771,11 @@ Y\xae\n\x8a\xaa\xa3\xaa#A6\xc7\x95\x8b}\xb7\xe1\xe9*G\xa4w\xda\x88\xa4\xd3vZ\
 \xcd\xff\x01,2\x98\xdb\x10\x8a7\xe1\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get028Bitmap():
 \xcd\xff\x01,2\x98\xdb\x10\x8a7\xe1\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get028Bitmap():

-    return wxBitmapFromImage(get028Image())
+    return BitmapFromImage(get028Image())

 
 def get028Image():
     stream = cStringIO.StringIO(get028Data())
 
 def get028Image():
     stream = cStringIO.StringIO(get028Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('028')
 catalog['028'] = ImageClass()
 
 index.append('028')
 catalog['028'] = ImageClass()


@@ -2870,11 +2870,11 @@ I\x82K\x921\xd3\xf6D\x1f\xc9\x971\xcaw\xbb\x1d]\x0f\xd6Y\xb4\xb617\x86+C\xe9\
 \xf5\x97\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get029Bitmap():
 \xf5\x97\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get029Bitmap():

-    return wxBitmapFromImage(get029Image())
+    return BitmapFromImage(get029Image())

 
 def get029Image():
     stream = cStringIO.StringIO(get029Data())
 
 def get029Image():
     stream = cStringIO.StringIO(get029Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('029')
 catalog['029'] = ImageClass()
 
 index.append('029')
 catalog['029'] = ImageClass()


@@ -2966,11 +2966,11 @@ w\xaf\xb9\xbd\xbd\x89\x00\xba\xd8\x825M=#\x9bL\xf6^\xa1\x94\xc2y\x8f\xed:\
 \x8c/j\xfe\x0f\xd8\x1d\x10\x98\x84\xbe&\x9c\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get030Bitmap():
 \x8c/j\xfe\x0f\xd8\x1d\x10\x98\x84\xbe&\x9c\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get030Bitmap():

-    return wxBitmapFromImage(get030Image())
+    return BitmapFromImage(get030Image())

 
 def get030Image():
     stream = cStringIO.StringIO(get030Data())
 
 def get030Image():
     stream = cStringIO.StringIO(get030Data())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('030')
 catalog['030'] = ImageClass()
 
 index.append('030')
 catalog['030'] = ImageClass()


@@ -4190,11 +4190,11 @@ Q\x19\xff\x8c|\x1f\xf2\xbe<I\xfb\xe1^0c3\xffl\xf2\xe7\xac\xeb8\xf9S\xf8\xe7\
 \xeb\xff\x01i,\xc7\x8e\xcc\nl+\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getecloudsBitmap():
 \xeb\xff\x01i,\xc7\x8e\xcc\nl+\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getecloudsBitmap():

-    return wxBitmapFromImage(getecloudsImage())
+    return BitmapFromImage(getecloudsImage())

 
 def getecloudsImage():
     stream = cStringIO.StringIO(getecloudsData())
 
 def getecloudsImage():
     stream = cStringIO.StringIO(getecloudsData())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('eclouds')
 catalog['eclouds'] = ImageClass()
 
 index.append('eclouds')
 catalog['eclouds'] = ImageClass()


@@ -4251,11 +4251,11 @@ X\xb3f\x1d\xdf|y\x16\xc5\xc4vL\xcd\xb3 \x07\xa9\xc1R\xc8)\xe1\x1d\xcf\xc1@\
 \x01\xfb\xcb\xb7\xc3\x1ew\xaaB\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getlogoBitmap():
 \x01\xfb\xcb\xb7\xc3\x1ew\xaaB\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getlogoBitmap():

-    return wxBitmapFromImage(getlogoImage())
+    return BitmapFromImage(getlogoImage())

 
 def getlogoImage():
     stream = cStringIO.StringIO(getlogoData())
 
 def getlogoImage():
     stream = cStringIO.StringIO(getlogoData())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('logo')
 catalog['logo'] = ImageClass()
 
 index.append('logo')
 catalog['logo'] = ImageClass()


@@ -4347,11 +4347,11 @@ P\x88\xf47\xbd\xbd\xaa\xac\x0e\xa5\xd8\x9b\xf4D\x04bO\x8a\x7f\xc7\x8b\x9a\
 \xbf\x01\xfc\t\xfa\\\xad\xe0v?\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getrestBitmap():
 \xbf\x01\xfc\t\xfa\\\xad\xe0v?\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getrestBitmap():

-    return wxBitmapFromImage(getrestImage())
+    return BitmapFromImage(getrestImage())

 
 def getrestImage():
     stream = cStringIO.StringIO(getrestData())
 
 def getrestImage():
     stream = cStringIO.StringIO(getrestData())

-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)

 
 index.append('rest')
 catalog['rest'] = ImageClass()
 
 index.append('rest')
 catalog['rest'] = ImageClass()