Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -10,7 +10,7 @@ class TestPanel(wxPanel):
 | 
			
		||||
    def __init__(self, parent, log):
 | 
			
		||||
        wxPanel.__init__(self, parent, -1)
 | 
			
		||||
 | 
			
		||||
        data = open(opj('bitmaps/image.gif'), "rb").read()
 | 
			
		||||
        data = open(opj('bitmaps/image.png'), "rb").read()
 | 
			
		||||
        stream = StringIO(data)
 | 
			
		||||
 | 
			
		||||
        bmp = wxBitmapFromImage( wxImageFromStream( stream ))
 | 
			
		||||
@@ -18,8 +18,7 @@ class TestPanel(wxPanel):
 | 
			
		||||
        wxStaticText(self, -1,
 | 
			
		||||
                     "This image was loaded from a Python file-like object:",
 | 
			
		||||
                     (15, 15))
 | 
			
		||||
        wxStaticBitmap(self, -1, bmp, (15, 45))
 | 
			
		||||
 | 
			
		||||
        wxStaticBitmap(self, -1, bmp, (15, 45))#, (bmp.GetWidth(), bmp.GetHeight()))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user