Forward port recent changes on the 2.8 branch to HEAD

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-16 23:39:42 +00:00
parent f6342fb5e6
commit 0b0849b5a5
87 changed files with 3807 additions and 1586 deletions
--- a/wxPython/wx/lib/imagebrowser.py
+++ b/wxPython/wx/lib/imagebrowser.py
@@ -95,7 +95,10 @@ class ImageView(wx.Window):
        if image is None:
            return

-        bmp = image.ConvertToBitmap()
+        try:
+            bmp = image.ConvertToBitmap()
+        except:
+            return

        iwidth = bmp.GetWidth()   # dimensions of image file
        iheight = bmp.GetHeight()