VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

[wxWidgets.git] / src / gtk1 / bitmap.cpp

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 0918af170798ebde32349770366c4f7902f89feb..33b1a1f286d2783345252629c3a2dc7b12c2a70b 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -332,7 +332,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
 
-    if (type == wxBITMAP_TYPE_PNG)
+    // Try to save the bitmap via wxImage handlers:
     {
         wxImage image( *this );
         if (image.Ok()) return image.SaveFile( name, type );
@@ -365,20 +365,13 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
         gdk_window_get_size( M_BMPDATA->m_pixmap, &(M_BMPDATA->m_width), &(M_BMPDATA->m_height) );
         M_BMPDATA->m_bpp = gdk_window_get_visual( parent )->depth;
     }
-    else if (type == wxBITMAP_TYPE_PNG)
+    else // try if wxImage can load it
     {
         wxImage image;
-        image.LoadFile( name, type );
+        if (!image.LoadFile( name, type )) return FALSE;
         if (image.Ok()) *this = image.ConvertToBitmap();
+        else return FALSE;
     }
-    else if (type == wxBITMAP_TYPE_BMP)
-    {
-        wxImage image;
-        image.LoadFile( name, type );
-        if (image.Ok()) *this = image.ConvertToBitmap();
-    }
-    else
-        return FALSE;
 
     return TRUE;
 }