merged 2.2 branch

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

wxPython/demo/wxImage.py

@@ -0,0 +1,40 @@
+
+from wxPython.wx import *
+
+#----------------------------------------------------------------------
+
+def runTest(frame, nb, log):
+    bmp = wxImage('bitmaps/image.bmp', wxBITMAP_TYPE_BMP).ConvertToBitmap()
+    gif = wxImage('bitmaps/image.gif', wxBITMAP_TYPE_GIF).ConvertToBitmap()
+    png = wxImage('bitmaps/image.png', wxBITMAP_TYPE_PNG).ConvertToBitmap()
+    jpg = wxImage('bitmaps/image.jpg', wxBITMAP_TYPE_JPEG).ConvertToBitmap()
+
+    panel = wxPanel(nb, -1)
+    pos = 10
+    wxStaticBitmap(panel, -1, bmp, wxPoint(10, pos),
+                   wxSize(bmp.GetWidth(), bmp.GetHeight()))
+
+    pos = pos + bmp.GetHeight() + 10
+    wxStaticBitmap(panel, -1, gif, wxPoint(10, pos),
+                   wxSize(gif.GetWidth(), gif.GetHeight()))
+
+    pos = pos + gif.GetHeight() + 10
+    wxStaticBitmap(panel, -1, png, wxPoint(10, pos),
+                   wxSize(png.GetWidth(), png.GetHeight()))
+
+    pos = pos + png.GetHeight() + 10
+    wxStaticBitmap(panel, -1, jpg, wxPoint(10, pos),
+                   wxSize(jpg.GetWidth(), jpg.GetHeight()))
+
+    return panel
+
+#----------------------------------------------------------------------
+
+
+
+
+
+
+
+overview = """\
+"""