Reworked how stock objects are initialized. They now have an

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

diff --git a/wxPython/demo/wxImageFromStream.py b/wxPython/demo/wxImageFromStream.py
index 1bf4fc76457cb6bab157a185ecf7d1042afefbf1..720389a818beccd8f811253f13294349d63f7f19 100644 (file)
--- a/wxPython/demo/wxImageFromStream.py
+++ b/wxPython/demo/wxImageFromStream.py
@@ -1,24 +1,31 @@
+# 11/19/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 

 
 

-from wxPython.wx import *
-from Main import opj
+import  cStringIO
+
+import  wx

 
 

-from cStringIO import StringIO
+from Main import opj

 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 

-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):

     def __init__(self, parent, log):
     def __init__(self, parent, log):

-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)

 
         data = open(opj('bitmaps/image.png'), "rb").read()
 
         data = open(opj('bitmaps/image.png'), "rb").read()

-        stream = StringIO(data)
+        stream = cStringIO.StringIO(data)
+
+        bmp = wx.BitmapFromImage( wx.ImageFromStream( stream ))

 
 

-        bmp = wxBitmapFromImage( wxImageFromStream( stream ))
+        wx.StaticText(
+            self, -1, "This image was loaded from a Python file-like object:", 
+            (15, 15)
+            )

 
 

-        wxStaticText(self, -1,
-                     "This image was loaded from a Python file-like object:",
-                     (15, 15))
-        wxStaticBitmap(self, -1, bmp, (15, 45))#, (bmp.GetWidth(), bmp.GetHeight()))
+        wx.StaticBitmap(self, -1, bmp, (15, 45))#, (bmp.GetWidth(), bmp.GetHeight()))

 
 
 
 
 
 


@@ -37,10 +44,7 @@ directly from any Python file-like object, such as a memory buffer
 using StringIO.  """
 
 
 using StringIO.  """
 
 

-
-

 if __name__ == '__main__':
     import sys,os
     import run
     run.main(['', os.path.basename(sys.argv[0])])
 if __name__ == '__main__':
     import sys,os
     import run
     run.main(['', os.path.basename(sys.argv[0])])

-