Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxBitmap::LoadFile and SaveFile now uses wxImage's methods in case there is no wxBitmap handler for given type

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-11-17 22:33:52 +00:00
parent 169ee06c44
commit b75dd496d2
5 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk1/bitmap.cpp
View File

@@ -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;
}