regnenerated image modules

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

wxPython/demo/images.py

@@ -1,8 +1,8 @@
 #----------------------------------------------------------------------
 # This file was generated by encode_bitmaps.py
 #
-from wxPython.wx import wxImageFromStream, wxBitmapFromImage
+from wx import ImageFromStream, BitmapFromImage
-from wxPython.wx import wxEmptyIcon
+from wx import EmptyIcon
 import cStringIO
 
 
@@ -17,14 +17,14 @@ o\xda\x84pB2\x1f\x81Fa\x8c\x9c\x08\x04Z{\xcf\xa72\xbcv\xfa\xc5\x08 \x80r\x80\
 \x04\x10@\xf9X\xbe\x00\xc9 \x14K\xab a\xf0\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getMondrianBitmap():
-    return wxBitmapFromImage(getMondrianImage())
+    return BitmapFromImage(getMondrianImage())
 
 def getMondrianImage():
     stream = cStringIO.StringIO(getMondrianData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 def getMondrianIcon():
-    icon = wxEmptyIcon()
+    icon = EmptyIcon()
     icon.CopyFromBitmap(getMondrianBitmap())
     return icon
 
@@ -67,11 +67,11 @@ def get_10s_Data():
 \x92_\xe1\xf4\x0f\x07\x007+p\xb2^\xe7\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def get_10s_Bitmap():
-    return wxBitmapFromImage(get_10s_Image())
+    return BitmapFromImage(get_10s_Image())
 
 def get_10s_Image():
     stream = cStringIO.StringIO(get_10s_Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def get_01c_Data():
@@ -103,11 +103,11 @@ D;\n\n\x93\x9c\x88GA!\xe4\xec\x89\x98-(\x84\x9c\xa8X\x0e!\x84\x9c\xbd\xe2;\
 \x82' 
 
 def get_01c_Bitmap():
-    return wxBitmapFromImage(get_01c_Image())
+    return BitmapFromImage(get_01c_Image())
 
 def get_01c_Image():
     stream = cStringIO.StringIO(get_01c_Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def get_12h_Data():
@@ -194,11 +194,11 @@ O\xdc\xd3\xa8\xdb\xed\xe33c\n\xf3\xe4\x84\rr\x8c\x9cs\x9f0\xc8\x03\xf3@\xde\
 \x00IEND\xaeB`\x82' 
 
 def get_12h_Bitmap():
-    return wxBitmapFromImage(get_12h_Image())
+    return BitmapFromImage(get_12h_Image())
 
 def get_12h_Image():
     stream = cStringIO.StringIO(get_12h_Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def get_13d_Data():
@@ -280,11 +280,11 @@ d\xfb\xc4\xd8\xe7\x9a\xe1\xc0\x93os\xf9\t\x9c\x00\x10\xf1\xd9\xecM\xb4\xfa\
 \x00IEND\xaeB`\x82' 
 
 def get_13d_Bitmap():
-    return wxBitmapFromImage(get_13d_Image())
+    return BitmapFromImage(get_13d_Image())
 
 def get_13d_Image():
     stream = cStringIO.StringIO(get_13d_Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBackgroundData():
@@ -1774,11 +1774,11 @@ d\x0f9\xf4\x11\xb5\xa6\x99\x17X7\xc6id\n\x1a\xc4\xca\x9c\xf0\xd4\x83\x17\x82\
 \xff\xa2\x02p7\xf7\xc3\xea\xba\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getBackgroundBitmap():
-    return wxBitmapFromImage(getBackgroundImage())
+    return BitmapFromImage(getBackgroundImage())
 
 def getBackgroundImage():
     stream = cStringIO.StringIO(getBackgroundData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getTestStarData():
@@ -1890,11 +1890,11 @@ x\xdd\xc2{\x89\x95\xb0\xea\xecQX\xae!\xe1\x11\xaf\xb8\x1a\xd8V3\x88,\x0e\xa4\
 \x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getTestStarBitmap():
-    return wxBitmapFromImage(getTestStarImage())
+    return BitmapFromImage(getTestStarImage())
 
 def getTestStarImage():
     stream = cStringIO.StringIO(getTestStarData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getTestStar2Data():
@@ -2004,11 +2004,11 @@ W\xa2\xae\xcc\xb0\x978t\x80NK\\\xf3\x9eKq\x1aq\xcd\xfa;\x87\xfdq\x00\xdc~\
 \xa5\xb1\xf2\xedY1)\x9f\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getTestStar2Bitmap():
-    return wxBitmapFromImage(getTestStar2Image())
+    return BitmapFromImage(getTestStar2Image())
 
 def getTestStar2Image():
     stream = cStringIO.StringIO(getTestStar2Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getTestMaskData():
@@ -2055,11 +2055,11 @@ W\xeb\xf9\xf1,l\xe5\xad#\xe3\xce\x085\xe1\xad&>\xbfQ\x19\x11\t\xde\x03\x8a~^\
 \x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getTestMaskBitmap():
-    return wxBitmapFromImage(getTestMaskImage())
+    return BitmapFromImage(getTestMaskImage())
 
 def getTestMaskImage():
     stream = cStringIO.StringIO(getTestMaskData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getTest2Data():
@@ -2163,11 +2163,11 @@ r\x04M\x15\x0f9\xee\xfdz\x191\xd6\x99\xd6\xf6\x87j\x07?\x9a\xab\x80J0r\x884*\
 \x00\x00IEND\xaeB`\x82' 
 
 def getTest2Bitmap():
-    return wxBitmapFromImage(getTest2Image())
+    return BitmapFromImage(getTest2Image())
 
 def getTest2Image():
     stream = cStringIO.StringIO(getTest2Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getRobinData():
@@ -3199,11 +3199,11 @@ S]\xf0|\\\x9eN\xe0\xf9\xae^\x82\x97\xa5\xcfUJA\x97\x92\x7fv\x02\x9e\x96n\x96\
 \xe7OGz\xce\x99\xff\rv\xfc.\x03\xb7[!I\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getRobinBitmap():
-    return wxBitmapFromImage(getRobinImage())
+    return BitmapFromImage(getRobinImage())
 
 def getRobinImage():
     stream = cStringIO.StringIO(getRobinData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBulb1Data():
@@ -3222,11 +3222,11 @@ D\x05y$3\x17\x92K\x1cG\xb2C\xab\xb0\x07\xc7\x91\x93&j`\x04\xa9\xe0\x80\x94\
 \x00\x00\x00IEND\xaeB`\x82" 
 
 def getBulb1Bitmap():
-    return wxBitmapFromImage(getBulb1Image())
+    return BitmapFromImage(getBulb1Image())
 
 def getBulb1Image():
     stream = cStringIO.StringIO(getBulb1Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBulb2Data():
@@ -3252,11 +3252,11 @@ BN\xd7\x07\x19#F\xfc\x1b\xc0\xbd\xb4\xb7/\xef\xaf\\\x1d\xaf\x9dg%\xc8L\x98\
 \xaeB`\x82' 
 
 def getBulb2Bitmap():
-    return wxBitmapFromImage(getBulb2Image())
+    return BitmapFromImage(getBulb2Image())
 
 def getBulb2Image():
     stream = cStringIO.StringIO(getBulb2Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getCalendarData():
@@ -3282,11 +3282,11 @@ def getCalendarData():
 \x1d\xd9\x8cG\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getCalendarBitmap():
-    return wxBitmapFromImage(getCalendarImage())
+    return BitmapFromImage(getCalendarImage())
 
 def getCalendarImage():
     stream = cStringIO.StringIO(getCalendarData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getDbDecData():
@@ -3301,11 +3301,11 @@ ATx\x9c\xed\xd5K\n\xc0 \x0c\x04\xd0\x89x\xafz\xf4\xf4dv\xd5\x82\x18\x17JH\
 \xb4\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getDbDecBitmap():
-    return wxBitmapFromImage(getDbDecImage())
+    return BitmapFromImage(getDbDecImage())
 
 def getDbDecImage():
     stream = cStringIO.StringIO(getDbDecData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getDecData():
@@ -3320,11 +3320,11 @@ mr\x0fT\x1a\x80\xcf.\xd6\x939\xe4\xf0{\x00f\xf8\x12\xc0\x0e\x9f\x02*\xc2\xcd\
  
 
 def getDecBitmap():
-    return wxBitmapFromImage(getDecImage())
+    return BitmapFromImage(getDecImage())
 
 def getDecImage():
     stream = cStringIO.StringIO(getDecData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getPtData():
@@ -3337,11 +3337,11 @@ ATx\x9c\xed\xd3\xb1\r\x00 \x0c\x03A\x83\x18,\xa3{3\xa8`\x80P\xb8yW\xa9\x92S$\
 \xc4\x01\x07\xb8\x89\x07\xc3i\xa2d\xe7\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getPtBitmap():
-    return wxBitmapFromImage(getPtImage())
+    return BitmapFromImage(getPtImage())
 
 def getPtImage():
     stream = cStringIO.StringIO(getPtData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getDbIncData():
@@ -3356,11 +3356,11 @@ ATx\x9c\xed\xd51\x0e\xc0 \x0c\x03@S\xf1\xaf\xf2t\xf32\xbav \x10\tH;\xd8#H\
 \x00IEND\xaeB`\x82' 
 
 def getDbIncBitmap():
-    return wxBitmapFromImage(getDbIncImage())
+    return BitmapFromImage(getDbIncImage())
 
 def getDbIncImage():
     stream = cStringIO.StringIO(getDbIncData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getIncData():
@@ -3374,11 +3374,11 @@ ATx\x9c\xed\xd01\x0e\xc00\x08\x03@R\xe5a<\xdd?k\xd7*C \x12\x0e\x8bY\x91\xf0\
 \x07'\xb7\x1b\x83{\xd5\xec\x82\x00\x00\x00\x00IEND\xaeB`\x82" 
 
 def getIncBitmap():
-    return wxBitmapFromImage(getIncImage())
+    return BitmapFromImage(getIncImage())
 
 def getIncImage():
     stream = cStringIO.StringIO(getIncData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getNewData():
@@ -3392,11 +3392,11 @@ def getNewData():
 \xaeB`\x82' 
 
 def getNewBitmap():
-    return wxBitmapFromImage(getNewImage())
+    return BitmapFromImage(getNewImage())
 
 def getNewImage():
     stream = cStringIO.StringIO(getNewData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getOpenData():
@@ -3412,11 +3412,11 @@ def getOpenData():
 VBM\x1c\xb6\x0b\x8c\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getOpenBitmap():
-    return wxBitmapFromImage(getOpenImage())
+    return BitmapFromImage(getOpenImage())
 
 def getOpenImage():
     stream = cStringIO.StringIO(getOpenData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getCopyData():
@@ -3433,11 +3433,11 @@ G\xcf( \x85k@\x12\xcdA\xf3\xd6\x02\xc9\xa6\xae\xad=\xa0\xbcj\xc8 \n\xb2\x06\
 D\xaeB`\x82' 
 
 def getCopyBitmap():
-    return wxBitmapFromImage(getCopyImage())
+    return BitmapFromImage(getCopyImage())
 
 def getCopyImage():
     stream = cStringIO.StringIO(getCopyData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getCopy2Data():
@@ -3453,11 +3453,11 @@ def getCopy2Data():
 \xf4x\xe1\x1d\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getCopy2Bitmap():
-    return wxBitmapFromImage(getCopy2Image())
+    return BitmapFromImage(getCopy2Image())
 
 def getCopy2Image():
     stream = cStringIO.StringIO(getCopy2Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getPasteData():
@@ -3473,11 +3473,11 @@ C\xbc$\xe7\x84\xa7d\xe6\xcb\xca\xfb\x12P\xaa{\x83\xd1u\x8eT\x01\xf6\xa6\\\
 \xd3[}\x01\xae\xae\\MU1v\xee\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getPasteBitmap():
-    return wxBitmapFromImage(getPasteImage())
+    return BitmapFromImage(getPasteImage())
 
 def getPasteImage():
     stream = cStringIO.StringIO(getPasteData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getTog1Data():
@@ -3490,11 +3490,11 @@ def getTog1Data():
 \xb8p&sFJs#\x00\x10\x80\x0e\xb7\x14)\xcb\xf7\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getTog1Bitmap():
-    return wxBitmapFromImage(getTog1Image())
+    return BitmapFromImage(getTog1Image())
 
 def getTog1Image():
     stream = cStringIO.StringIO(getTog1Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getTog2Data():
@@ -3507,11 +3507,11 @@ def getTog2Data():
 IEND\xaeB`\x82' 
 
 def getTog2Bitmap():
-    return wxBitmapFromImage(getTog2Image())
+    return BitmapFromImage(getTog2Image())
 
 def getTog2Image():
     stream = cStringIO.StringIO(getTog2Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getSmilesData():
@@ -3547,11 +3547,11 @@ b`\r\xa8\x02\x8d=d\x81\xb69}"\rq\x07\xc4i\x00\x9c\\\xae\x87Fc\x05\xf8\x0fhP(\
 \x00\x00\x00IEND\xaeB`\x82' 
 
 def getSmilesBitmap():
-    return wxBitmapFromImage(getSmilesImage())
+    return BitmapFromImage(getSmilesImage())
 
 def getSmilesImage():
     stream = cStringIO.StringIO(getSmilesData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getGridBGData():
@@ -3576,11 +3576,11 @@ l\xea\xe9iwO\x17\x86\x9e65bP\x98Aa\x06\x85\x19\x14\xe6\xd8\x04\x1b\xeamS\xeb\
 \xaeB`\x82' 
 
 def getGridBGBitmap():
-    return wxBitmapFromImage(getGridBGImage())
+    return BitmapFromImage(getGridBGImage())
 
 def getGridBGImage():
     stream = cStringIO.StringIO(getGridBGData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getSmallUpArrowData():
@@ -3593,11 +3593,11 @@ def getSmallUpArrowData():
 \x82' 
 
 def getSmallUpArrowBitmap():
-    return wxBitmapFromImage(getSmallUpArrowImage())
+    return BitmapFromImage(getSmallUpArrowImage())
 
 def getSmallUpArrowImage():
     stream = cStringIO.StringIO(getSmallUpArrowData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getSmallDnArrowData():
@@ -3610,11 +3610,11 @@ def getSmallDnArrowData():
 \x1d\xc4;\xb7\x00\x00\x00\x00IEND\xaeB`\x82" 
 
 def getSmallDnArrowBitmap():
-    return wxBitmapFromImage(getSmallDnArrowImage())
+    return BitmapFromImage(getSmallDnArrowImage())
 
 def getSmallDnArrowImage():
     stream = cStringIO.StringIO(getSmallDnArrowData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getFolder1Data():
@@ -3631,11 +3631,11 @@ def getFolder1Data():
 \x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getFolder1Bitmap():
-    return wxBitmapFromImage(getFolder1Image())
+    return BitmapFromImage(getFolder1Image())
 
 def getFolder1Image():
     stream = cStringIO.StringIO(getFolder1Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getFolder2Data():
@@ -3651,11 +3651,11 @@ T\xfc0o>\x98]\xe0\x8e \xea\xa3M\x96\x86d\xb4e\x80\x88\x06\xfc\x82\xa9\\\xa4\
 \xee-\xdf\xd1\x10'\xda\x00\x00\x00\x00IEND\xaeB`\x82" 
 
 def getFolder2Bitmap():
-    return wxBitmapFromImage(getFolder2Image())
+    return BitmapFromImage(getFolder2Image())
 
 def getFolder2Image():
     stream = cStringIO.StringIO(getFolder2Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getFolder3Data():
@@ -3670,11 +3670,11 @@ def getFolder3Data():
 \xaeB`\x82' 
 
 def getFolder3Bitmap():
-    return wxBitmapFromImage(getFolder3Image())
+    return BitmapFromImage(getFolder3Image())
 
 def getFolder3Image():
     stream = cStringIO.StringIO(getFolder3Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getFile1Data():
@@ -3688,11 +3688,11 @@ def getFile1Data():
 \x00\x00IEND\xaeB`\x82' 
 
 def getFile1Bitmap():
-    return wxBitmapFromImage(getFile1Image())
+    return BitmapFromImage(getFile1Image())
 
 def getFile1Image():
     stream = cStringIO.StringIO(getFile1Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getFile2Data():
@@ -3706,11 +3706,11 @@ def getFile2Data():
 \x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getFile2Bitmap():
-    return wxBitmapFromImage(getFile2Image())
+    return BitmapFromImage(getFile2Image())
 
 def getFile2Image():
     stream = cStringIO.StringIO(getFile2Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getNoIconData():
@@ -3726,11 +3726,11 @@ a\xf3d\x00\x1db\xa3\xcb\x10\xfe\x05\x04 \x00\x1c`\x07L\xe6D}K$$\x87\x00\x00\
 \x00\x00IEND\xaeB`\x82' 
 
 def getNoIconBitmap():
-    return wxBitmapFromImage(getNoIconImage())
+    return BitmapFromImage(getNoIconImage())
 
 def getNoIconImage():
     stream = cStringIO.StringIO(getNoIconData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getWizTest1Data():
@@ -3895,11 +3895,11 @@ Z\xbbp*\xc6\xd8\rZ\x0bJ\xbb[\x80Q\x1a\xd4\xf6\x9b\x17\xc3\x18\rj\x10C\xff\
 \xd2\x8b\x12\xe7\xc3\x8c\xd4\xb6\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getWizTest1Bitmap():
-    return wxBitmapFromImage(getWizTest1Image())
+    return BitmapFromImage(getWizTest1Image())
 
 def getWizTest1Image():
     stream = cStringIO.StringIO(getWizTest1Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getWizTest2Data():
@@ -4074,11 +4074,11 @@ U*`\x9e\xbf\x8f;\xcf<\xf2\x94L\x0ey`\xd6\x91\x03\xcd\x85\xa0p\x81}\x1fB$\xdc\
 \x01\xf6\x8dNq(hH\xc7\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getWizTest2Bitmap():
-    return wxBitmapFromImage(getWizTest2Image())
+    return BitmapFromImage(getWizTest2Image())
 
 def getWizTest2Image():
     stream = cStringIO.StringIO(getWizTest2Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getTuxData():
@@ -5385,11 +5385,11 @@ F\x05jr\xacQ\xa3F\x8d\n\xd4\xe4X\xa3F\x8d\x1a\x15\xa8\xc9\xb1F\x8d\x1a5*P\
 \x0f\xa1d F\x88q*\xa3\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getTuxBitmap():
-    return wxBitmapFromImage(getTuxImage())
+    return BitmapFromImage(getTuxImage())
 
 def getTuxImage():
     stream = cStringIO.StringIO(getTuxData())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom01Data():
@@ -5411,11 +5411,11 @@ g\xa0\x87]A\xb8\x00R0D\xd9\xca\xdf\xc8@\xf6h\x15a\r\x92\x02\xe8\x17@\xef\x9b\
 \x11\x88\x1f\x16\x83\xc4;y\xb9\x8f\xf2\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom01Bitmap():
-    return wxBitmapFromImage(getBlom01Image())
+    return BitmapFromImage(getBlom01Image())
 
 def getBlom01Image():
     stream = cStringIO.StringIO(getBlom01Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom02Data():
@@ -5443,11 +5443,11 @@ hv\x01\x1a@;Pyo\xcf|\xd8:}\xb7\x94\x9e\x03o\x90w\xf7\xae,\xfbY\x130\xcf\xce\
 \x8bY\xee\x8f\\Ix\x17\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom02Bitmap():
-    return wxBitmapFromImage(getBlom02Image())
+    return BitmapFromImage(getBlom02Image())
 
 def getBlom02Image():
     stream = cStringIO.StringIO(getBlom02Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom03Data():
@@ -5474,11 +5474,11 @@ def getBlom03Data():
 \x05\x93\xf4\xf9\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom03Bitmap():
-    return wxBitmapFromImage(getBlom03Image())
+    return BitmapFromImage(getBlom03Image())
 
 def getBlom03Image():
     stream = cStringIO.StringIO(getBlom03Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom04Data():
@@ -5505,11 +5505,11 @@ D\x80\x18\x96C\xb3\xf9QT"*!o\xb5\xb2\x9b\xc9_D\x00\x8aA\x00\xbb\x9d?d\x08\
 \xb9\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom04Bitmap():
-    return wxBitmapFromImage(getBlom04Image())
+    return BitmapFromImage(getBlom04Image())
 
 def getBlom04Image():
     stream = cStringIO.StringIO(getBlom04Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom05Data():
@@ -5547,11 +5547,11 @@ d MQ\x11:D<\xe3\x93GB{\x1d\xf2\xbe,\xcb\xdd.\xbbG\xd2\x14\x80\xadW\xfe"\x00\
 \x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom05Bitmap():
-    return wxBitmapFromImage(getBlom05Image())
+    return BitmapFromImage(getBlom05Image())
 
 def getBlom05Image():
     stream = cStringIO.StringIO(getBlom05Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom06Data():
@@ -5579,11 +5579,11 @@ def getBlom06Data():
 \xb7\xe5\x03\xd9\xd7\xfa\xe5$\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom06Bitmap():
-    return wxBitmapFromImage(getBlom06Image())
+    return BitmapFromImage(getBlom06Image())
 
 def getBlom06Image():
     stream = cStringIO.StringIO(getBlom06Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom07Data():
@@ -5621,11 +5621,11 @@ F*$U\x8a\x15\x9bI\xe8\xe7\x81OJ\xa5\x01\x95f*8\xdf\'\x8b\x7f;\xd6>"\x04M\xbd\
 \x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom07Bitmap():
-    return wxBitmapFromImage(getBlom07Image())
+    return BitmapFromImage(getBlom07Image())
 
 def getBlom07Image():
     stream = cStringIO.StringIO(getBlom07Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom08Data():
@@ -5652,11 +5652,11 @@ NM\xe6G1\xf4\xc0\xd0\x80\x834\xa7/ .\xae.\xf9H\x15hL\xf3R\xc5_\xef\xda<\x0b\
 \xaeB`\x82' 
 
 def getBlom08Bitmap():
-    return wxBitmapFromImage(getBlom08Image())
+    return BitmapFromImage(getBlom08Image())
 
 def getBlom08Image():
     stream = cStringIO.StringIO(getBlom08Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom09Data():
@@ -5688,11 +5688,11 @@ ATx\x9c\xa5\x97\xcd\x99\x1b!\x0c\x86?\x9e\xc79\'\xdb\x82S\x02\x1cR\xc0\xd6\
 \xa0v2\x1aUo}\xff\x01\x93\xa6\xb8)r27w\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom09Bitmap():
-    return wxBitmapFromImage(getBlom09Image())
+    return BitmapFromImage(getBlom09Image())
 
 def getBlom09Image():
     stream = cStringIO.StringIO(getBlom09Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom10Data():
@@ -5716,11 +5716,11 @@ b\xa8\x90\xf5\xd32DK\xeb\r\xd8\x1b\x80\xaa\xc2\x1dQ\xcay\xbbX\x98y\xe8\x0f-\
 \xaeB`\x82' 
 
 def getBlom10Bitmap():
-    return wxBitmapFromImage(getBlom10Image())
+    return BitmapFromImage(getBlom10Image())
 
 def getBlom10Image():
     stream = cStringIO.StringIO(getBlom10Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom11Data():
@@ -5748,11 +5748,11 @@ h0e@\x0b\x12Go\xc4gH@\xaf\x8e|x\xf0\xe6\x9a6\xdd^\xe0\x06\xb4\xbf\x010\x1f\
 \x82' 
 
 def getBlom11Bitmap():
-    return wxBitmapFromImage(getBlom11Image())
+    return BitmapFromImage(getBlom11Image())
 
 def getBlom11Image():
     stream = cStringIO.StringIO(getBlom11Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom12Data():
@@ -5775,11 +5775,11 @@ ATx\x9c\xc5\x97\xdd\x11\xc2@\x08\x84Y'\x9d\xa4\x85\xf4\x94\x9a\xd2\x93-\xa4\
 \xab|C\x98\xe78\x00\x00\x00\x00IEND\xaeB`\x82" 
 
 def getBlom12Bitmap():
-    return wxBitmapFromImage(getBlom12Image())
+    return BitmapFromImage(getBlom12Image())
 
 def getBlom12Image():
     stream = cStringIO.StringIO(getBlom12Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom13Data():
@@ -5811,11 +5811,11 @@ e\x15\x19\x7f\xcc\x7f\xb6\xfb\x02\xc0c\xde\xf0\xbaK\xa7\x82S\xa0Vr\x9fLn\xcc\
 \xfd>\x10\xb5\x1e\x93\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom13Bitmap():
-    return wxBitmapFromImage(getBlom13Image())
+    return BitmapFromImage(getBlom13Image())
 
 def getBlom13Image():
     stream = cStringIO.StringIO(getBlom13Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom14Data():
@@ -5851,11 +5851,11 @@ f\x14o3\xa5h\xc33\xa6\x94jj\x7f\xd6\xa7Y\xf0\x8e\x89\x08\x16\x7f:(\xba\xd4\
 \x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom14Bitmap():
-    return wxBitmapFromImage(getBlom14Image())
+    return BitmapFromImage(getBlom14Image())
 
 def getBlom14Image():
     stream = cStringIO.StringIO(getBlom14Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 
 #----------------------------------------------------------------------
 def getBlom15Data():
@@ -5881,9 +5881,9 @@ w\x82\xf6\xdeM\x9d\xac#b\x1aD\n\x00"\x02\x11\x01\x00@)\x05j\xad\xa6\x9d\xac\
 \xf1\x16(\xed\x1f\x94\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getBlom15Bitmap():
-    return wxBitmapFromImage(getBlom15Image())
+    return BitmapFromImage(getBlom15Image())
 
 def getBlom15Image():
     stream = cStringIO.StringIO(getBlom15Data())
-    return wxImageFromStream(stream)
+    return ImageFromStream(stream)
 

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()
@@ -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():
-    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()