X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbd5dd1dfa8aa5d7574e2f3e6d898dc8bb4c89c4..52f52ebc4e0be6a9899d328b08db9eb14629d219:/wxPython/demo/images.py?ds=sidebyside diff --git a/wxPython/demo/images.py b/wxPython/demo/images.py index c7365a9ee2..8ac24a92f9 100644 --- a/wxPython/demo/images.py +++ b/wxPython/demo/images.py @@ -1,8 +1,8 @@ #---------------------------------------------------------------------- # This file was generated by encode_bitmaps.py # -from wxPython.wx import wxImageFromStream, wxBitmapFromImage -from wxPython.wx import wxEmptyIcon +from wx import ImageFromStream, BitmapFromImage +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)