X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..0c02082608f0646056053f99bdcccccd67dcaf03:/wxPython/demo/throbImages.py

diff --git a/wxPython/demo/throbImages.py b/wxPython/demo/throbImages.py
index 54535e5bdc..05b49caf20 100644
--- a/wxPython/demo/throbImages.py
+++ b/wxPython/demo/throbImages.py
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------
 # This file was generated by encode_bitmaps.py
 #
-from wxPython.wx import wxImageFromStream, wxBitmapFromImage
+from wx import ImageFromStream, BitmapFromImage
 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():
-    return wxBitmapFromImage(get001Image())
+    return BitmapFromImage(get001Image())
 
 def get001Image():
     stream = cStringIO.StringIO(get001Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get002Image())
+    return BitmapFromImage(get002Image())
 
 def get002Image():
     stream = cStringIO.StringIO(get002Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get003Image())
+    return BitmapFromImage(get003Image())
 
 def get003Image():
     stream = cStringIO.StringIO(get003Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get004Image())
+    return BitmapFromImage(get004Image())
 
 def get004Image():
     stream = cStringIO.StringIO(get004Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get005Image())
+    return BitmapFromImage(get005Image())
 
 def get005Image():
     stream = cStringIO.StringIO(get005Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get006Image())
+    return BitmapFromImage(get006Image())
 
 def get006Image():
     stream = cStringIO.StringIO(get006Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get007Image())
+    return BitmapFromImage(get007Image())
 
 def get007Image():
     stream = cStringIO.StringIO(get007Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get008Image())
+    return BitmapFromImage(get008Image())
 
 def get008Image():
     stream = cStringIO.StringIO(get008Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get009Image())
+    return BitmapFromImage(get009Image())
 
 def get009Image():
     stream = cStringIO.StringIO(get009Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get010Image())
+    return BitmapFromImage(get010Image())
 
 def get010Image():
     stream = cStringIO.StringIO(get010Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get011Image())
+    return BitmapFromImage(get011Image())
 
 def get011Image():
     stream = cStringIO.StringIO(get011Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get012Image())
+    return BitmapFromImage(get012Image())
 
 def get012Image():
     stream = cStringIO.StringIO(get012Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get013Image())
+    return BitmapFromImage(get013Image())
 
 def get013Image():
     stream = cStringIO.StringIO(get013Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get014Image())
+    return BitmapFromImage(get014Image())
 
 def get014Image():
     stream = cStringIO.StringIO(get014Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get015Image())
+    return BitmapFromImage(get015Image())
 
 def get015Image():
     stream = cStringIO.StringIO(get015Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get016Image())
+    return BitmapFromImage(get016Image())
 
 def get016Image():
     stream = cStringIO.StringIO(get016Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get017Image())
+    return BitmapFromImage(get017Image())
 
 def get017Image():
     stream = cStringIO.StringIO(get017Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get018Image())
+    return BitmapFromImage(get018Image())
 
 def get018Image():
     stream = cStringIO.StringIO(get018Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get019Image())
+    return BitmapFromImage(get019Image())
 
 def get019Image():
     stream = cStringIO.StringIO(get019Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get020Image())
+    return BitmapFromImage(get020Image())
 
 def get020Image():
     stream = cStringIO.StringIO(get020Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get021Image())
+    return BitmapFromImage(get021Image())
 
 def get021Image():
     stream = cStringIO.StringIO(get021Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get022Image())
+    return BitmapFromImage(get022Image())
 
 def get022Image():
     stream = cStringIO.StringIO(get022Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get023Image())
+    return BitmapFromImage(get023Image())
 
 def get023Image():
     stream = cStringIO.StringIO(get023Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get024Image())
+    return BitmapFromImage(get024Image())
 
 def get024Image():
     stream = cStringIO.StringIO(get024Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get025Image())
+    return BitmapFromImage(get025Image())
 
 def get025Image():
     stream = cStringIO.StringIO(get025Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get026Image())
+    return BitmapFromImage(get026Image())
 
 def get026Image():
     stream = cStringIO.StringIO(get026Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get027Image())
+    return BitmapFromImage(get027Image())
 
 def get027Image():
     stream = cStringIO.StringIO(get027Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get028Image())
+    return BitmapFromImage(get028Image())
 
 def get028Image():
     stream = cStringIO.StringIO(get028Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get029Image())
+    return BitmapFromImage(get029Image())
 
 def get029Image():
     stream = cStringIO.StringIO(get029Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(get030Image())
+    return BitmapFromImage(get030Image())
 
 def get030Image():
     stream = cStringIO.StringIO(get030Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(getecloudsImage())
+    return BitmapFromImage(getecloudsImage())
 
 def getecloudsImage():
     stream = cStringIO.StringIO(getecloudsData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 index.append('eclouds')
 catalog['eclouds'] = ImageClass()
@@ -4208,54 +4208,54 @@ def getlogoData():
     return \
 '\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x1d\x00\x00\x00 \x08\x06\
 \x00\x00\x00\xeews|\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x04\x07IDATx\x9c\xc5\x97]l\x14U\x14\xc7\x7fwf:;\xb3\xdd\x8fF\xb7%,-\xd0B\r\
-\x9aJ\x0b\xd4UJb\x82\x84\xc4\x07\xa4\x12\xa8\x04\xf1\x83\x84\xc4\x07P\x83\
-\x1f\xa1\xa9\x89\x84\x10\xa2\xc1\x07cBK|0\xf1\x05%1\xf8\xa8\x96\x04\x83\x0fF\
-\x8c\xbe\xd4\xc4\xc8G\r\x15\xa9E`)\xdd\xc9Lgwfw\xae\x0f\x9bnZ\xbam\xb7\xc8\
-\xc7y\x9a\xb9s\xef\xf9\xdds\xce\xff\xcc\x9d\x11555\xdcoS\xee;\xf1AA\xb5\xf9.\
-\xb0,[N\\\xc7b\x11qO\xa1\x93a\x00\x8b\x17\xd7c\xdb\x8e\xcc\xe7\xfdy\x83\xef8\
-\xbd\xaa\xaa\xa2(\xca\xb4\xcdTb\x15G*\x84\xa0\xaaJ\xc3\xf3|\x00\x86\x87G\xe6\
-\xcb*YE\x91Z\x96-w\xedz\x85\xce\xce\xcd\x00\xec\xdb\xf7&\'N\x1c\'\x91x\xf8\
-\xdeAc\xb1\x88\xd0u\x9d\xf6\xf65\xd4\xc4\xa3477\xd3\xdb{\x8c\xae\xaem\xf7\
-\x0e\n`\xa8\x1eucG8\xf3\xa9O\x83z\x94\xc7\x97\xba\\\xfb\xb7\x98\xe2\xf9\xd6\
-\xb5\xe2\x9a\xb6\xa8_\xf2l\x87\x82\x9eL\xd0l\xda\xacl\xba\xc2\x07\xbd\x03\
-\xf3a\xcd\x1fz.\xbd\x80\x94u\x13=\xc8\x90\x19\xf1\x10j3\xa3\xbeFk\xabdx\xf8\
-\x1f|?ww\xa1\x96e\xcbDK7\x972\x83\xe8\xc3\x03\xa8\xb5O\xb1\xf8\xc9=\xec\xae\
-\x1f\xa6\xeb\x85\xedH)q]WF"\xd5\x15\xf5\xac\xa8\xe4\x85\x9f\\\x98\x94g\x7f\
-\xfe\x89\xc1\x8b\x17\xf1}\x9f\xc6\xa6&jk\x13\x08!\xd8\xb4\xa9\x93\xfe\xfeS\
-\x08!\x88F+\x83\xce)$\xcb\xb2\xe5\xfe\xee\xfdD\xa3\x11\xdaV\xb5\xf1D*E]]-B\
-\x14\xfdO(XJY\xb1\xa0f\x85Z\x96-5McQ2\x89\xef\xfb\xb8n\x16\xcf\xf3\x08\x82\
-\x80\xb1\xb1\x0c\x17.\x0c\xb2t\xc9\x12\x12\x89\x04\x86\x11*\xad\xf9_\xd0p8\
-\xcc\x86\r\xeb\xe9X\xd7\x81\xa6i\x18\x86A(\xa4#\x84 \x1e\x8f\xb1|\xf92V<\xba\
-\x82\x9e\x9en4M\xc34\x8dJ\x02\x9d\xbd\xa6\xaa\xaa\xc9\xfe\xfeoY\xbdz\x15\x00\
-A Q\x94\xe9es\xc7]\xd6\xb4\xa7\xc8d2\\\xbf~\x03\x98\xfd\x04\x9a9R)d[[k\t\x08\
-\xe0y^\xd9\xa9f\xd8\xa4\xa1\xa1\x01\xc7q\xd0\xb4\xb9\x1bbF\xa8P\x04\x1b7n\
-\x9c2\x96\xcf\xe7gt\xb4\xa0\xae\x0e\x80B\xa1pgP\xcb\xb2e,\x16\xa5\xbe\xbe~N\
-\x07\x13\xa6UU\x01E\x15\xcf9\xb7\xdc\xe0\x9e\xcd\x1af\xf8\x067\xd37\xa6\x8cO\
-\xb4\xc9\xed\x96\xb7\xff$\x93\xbeL\xa1P R]\x8d\x196\xc9\xe5\xb23B\xcbF\xda\
-\xb3S\xe3\xe0n\x85[\xbf\x1f\xa0\xaf\xf7Xi\xf7\xaa\xaaN\x9b+%\xd8\xbf>\xc3C\
-\xeaY\xb2\xd9\x1c\xe3\xae\xcb[\xdb\x9d\x19\x81p\x9bz\xcf\x7f\x9e\x97\x9a\x06\
-\x86\tB@.\x80\r{=V\xae\xddA_\xdfQL\xd3\x9c\xe6`h\xe82\xa1\xdf:\xf8\xf1\x97\
-\x0c\xc7\xbf\x97\xb4,\x15\xbc\xf3\xaa\xc6#/W\xcd\xa8\xde)\xe9\r\x85@\x0fM\
-\xbaW\xe0\xc3\xd75\x9e{\xfb\x0b\x92\xc9$\x87\x0f\x1f\x9a\xe6\xc0\xcb\xe5\xc8\
-\x8e\xe5y\xba]\xa5\xfd1I<.\xa8\x0e\x0b\x86N\x14d\xe3\x0e\xb5,xJz\xcb\to]\x8b\
-\xc2\xa17\x96\xb1u\xeb\x96i\xcfl\xdb\xe6\xe0\x81\xf7\xc8f]\xe25\n\x0b\x17\
-\xa9TG\x8b.u]\xf2\xf7W\x85\xb2\xaa*AO\xbd\x9f\x95\xe5ZL\t`\xdb\xda\xab\xd8\
-\xe9\xa1R;8\x8e\xc3\xc9\x93_\x93Ju\xf0\xc3\xe9o\x10\x14\xcb1Yg^\x0e\xd2\xd7\
-\xca!\'\xa5\xd7\xcd\xc1\xd5\x91\x80HD`\x9a\x02=\x04%\xddd}>>\xf2\x12[.E1\x0c\
-\x93\xd1\xd1Q|\xbf\xf8\x81\xd6X\x0b\xbe/\t$\x08\t\xe3\x0e\xa4\xd3\x01\x1d\
-\xef\xeas\xd7\xf4\xf9\x8f\x8c\xd2\xa4Ov\x8eK\xc3\x104,T\x08\x9b0\xf0G\x81\
-\xcc8H\x19\x08\xd7u0\xcd\x10\xa6Y,\xbe\xa6\x8e\xcb\xf3\x83\x01\x86^\xc0\xf3\
-\xe1\xaf+\x92\xd7>3f=\xe2\xe6<O_lw\xe4-G\xf0\xdd\xb9\xf0\xac\x8e\xf6\xaewd\
-\xdf\x99\xbbx\x88\xdfm{ ?P\xff\x01\xab\xd2r\x12\x08\x0b1\xea\x00\x00\x00\x00\
-IEND\xaeB`\x82' 
+\x03\xfdIDATx\x9c\xc5\x97MlTU\x14\x80\xbf{\xef\x9b\xd7y\xd3?\xd2\x0e\x7f\xa5\
+\x05\xd44(V@lP01\xf1\x87\xc4B\x84\x10@B4JB\xa2\x11\x7f\x82\xba\xf2\'\x84\x10\
+\xa2!&\xb0\xa0\x10we\x81\xb2\x81%\x89\x0b\x8d.T\x0cu\x81\x89Q\x13\x0cH\xa8-\
+\xa5C\xed+3\xed\xcc\xbb\xf3\xdeqQ;\xe9\xd8ig\x06\x11Nr\x92\xf7s\xef\xf9\xee9\
+\xf7\x9cs\xdfSJ\x1b\xee\xb4\xe8;N\xbc[P\xa7\xda\t\n%\x93\xd7\x82\xa8[\x81V\
+\xec\xa9B\xc9T\xe0\xe2\xc5\xad475\xc9ls\xfe3\xf4\xdfb\x8cAk]\xe4y\xa5\xa2*\
+\xcd^\xad\xb4\xc4b\x0eA`\x01\x88\xc5b\x00Xk\xab\x0esE\x9e*\x94\xec\xda\xf5\
+\x12\x9b7o\x02`\xef\xde\xb78u\xea$\xc9ds5\xac\xea\xa0\x82(\xd7u\xe9\xec|\x84\
+9\x8d\xf5\xb4\xb7\xb7\xd3\xdd}\x9c\xed\xdb\xb7\xfd\x7fP\x80\xb8\t\x987r\x88\
+\xaf?\xb5\xb4\x99\xa3<\xb4t\x9c\xc1k\xfd\x00U\xefk\xc5%\xd3a>\xe7\xd9u\x1a\
+\xb7%I\xbb\x97f\xc5\xbdW\xf9\xa8\xfbB5\xac\xea\xa1\xbf\xa6\xe6\xb3f\xf4\x06n\
+\xe4\xe3\xf7\x07(\xd3\xce\xb0uX\xb9R\xe8\xeb\xfb\x93\xd4\x8d\xd4\xed\x85*\
+\x94$;^\xe5\x92\x7f\x11\xb7\xef\x02f\xeec,~t\x0f\xbb[\xfb\xd8\xfe\xfc\x0eD\
+\x04\xa3\xb5\x84QTY\x16+m\xca\xea\xf2\x07\x96\x8b\xef\x8f\xc8\x8f\xbd\xe7\
+\xe5\xdc\xf7\xdf\xc9\xb5k\x03\x12\x86V\xa2(/\x1b6l\x14\xad\x1d1&&\x95\xd8R\
+\xda\x94\x87j\xed\xc8\x89\x13\'$\x8a\xf2\x92\xcf\x07\x92\xcfO\xc0&\xb5\xa7\
+\xa7G\xb4v\nZ\tt\xd6\xf0*\x948\x8e\xc3\xa2\x96\x16\xac\xb5\x04\x81\xc5\x18\
+\x83\xeb\xc6\x18\x1d\xbd\xc9\xe0\xe0u\x96.YB2\x99$\x9d\xbeI6\x9bC\xa1\xa4l\
+\xb3\x98mEuu\r\xd2\xd5\xd5%\x99LZ\xc2\xd0\x8a\xb5\x81\x84\xa1-\xa8\xb5\x81\
+\x0c\x0c\xf4\xcb\x91#G\xa4\xa1\xa1Qjk\xeb*\xf2v\xd6\x97\xcd\xcdI\xe9\xed=_\
+\x04\x99\n\x9d\xd4\xf4\xcdQY\xb6\xec~Y\xb0`aEa\x9e\xb194\xd67\xc8\xaaU+Y\xbd\
+\xfa\xe1\xc2\xb3 \x08J\x8e\xf5\x12\x1emmmd2\x19\x1c\xa7|A\xcc\x08UZ\xb1~\xfd\
+\xfa\xa2g\xf9|~FC\xf3\xe7\xcd\x03 \x0c\xc3[\x83*\x9444\xd4\xd3\xda\xdaZ\xd6\
+\xc0\xa48\xff\x9c:"\xe5;b\xc9X\xec\xd9\xe4\xe0%\x86\xb8\x91\x1a*^\x8c*\x9d\
+\x94\xf9\xf4\xef\xf8\xa9+\x84aH]m-^\xc2\xe3\xfa\xd0P\xc9\xb10\x83\xa7\xef\
+\xbd\xe0\xb0\x7f\xb7\xe6\xaf\x9f\xf7q\xac\xfbxa\xf5\xc6L?{E \xdd\xfb\x14M\
+\xe6\x1c\xd9l\x8e\xb1\xf1q\xde\xde\x91\x99\x118\xb1\xf8)\x87\xf8\xc0\x19O\
+\x1c\x07\xe2\x1e(\x05\xb9\x08\x9e~=`\xc5\xda\x9d\x1c;v\x14\xcf\xf3\xa6\x19\
+\xb8|\xf9\n5?\xad\xe3\xdb\xf3>\'\xbf\x12:\x96*\xde}\xd9a\xfe\xe6\xec\x8c\xb5\
+Z\x14\xde\x9a\x1apk\xa6\xdck\xf8\xf8\r\x87\xe7\xde\xf9\x8c\x96\x96\x16\x0e\
+\x1e<0\xcd@\x90\xcb\x91\x1d\xc9\xf3D\xa7\xa1s\xb9\xd0\xd8\xa8\xa8M(\x86\xcf&\
+\xa4i\xe3XIpQxK%\xde\xe3\x1d\x9a\x03o\xde\xc7\xd6\xad[\xa6\xbdK\xa7\xd3\xec\
+\xdf\xf7>\xd9\xec8\x8ds4\x0b\x17\x19j\xeb\'L\xba\xae\xe0\x7f\x91(\x99U\x05\
+\xe8\x0f\x9f\xc4\xa4T\x89\xe9\x08\xb6\xad\x1d \x9d\xba\\(\x87L&\xc3\xe9\xd3g\
+X\xb3f\x1d\xdf|y\x16\xc5\xc4vL\xcd\xb3 \x07\xa9\xc1R\xc8)\xe1\x1d\xcf\xc1@\
+\x7fD]\x9d\xc2\xf3\x14n\r\x14\xf2&k9|\xe8E\xb6\\\xaa\'\x1e\xf7\x18\x1e\x1e\
+\xc6\xda\x89\x0f\xb4{\xe6\x82\xb5B$\xa0\x04\xc62\x90JE<\xf8J\xae\xfc\x9e>\
+\xf9\xa1-\x0c\xeay\xcdH<\xaeh[\xa8Ixp\xe1\x97\x10\x7f\x0cF|_\xe1\xfb\xc5\x06\
+\x8c\x91\xdf.F\xc4\xdd\x90\xc0\xc2\x1fW\x85\x1d\x87\xed\xad7|\xa5\r{\x9e\x89\
+\xc9\xce\xb5n\xd9&\xfe\xc1\x96\xca\xcf\xd3\x8a\xbf{o\xa7\xdc\x95\x1f\xa8\xbf\
+\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())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 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():
-    return wxBitmapFromImage(getrestImage())
+    return BitmapFromImage(getrestImage())
 
 def getrestImage():
     stream = cStringIO.StringIO(getrestData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 index.append('rest')
 catalog['rest'] = ImageClass()