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

for file load/save, always try wxImage first, fallback to pixbuf

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2010-01-08 18:19:23 +00:00
parent abae3b805f
commit 8362e67ca7
1 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/gtk/bitmap.cpp
View File

@@ -629,42 +629,37 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett
wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") ); wxCHECK_MSG( IsOk(), false, wxT("invalid bitmap") );
#if wxUSE_IMAGE #if wxUSE_IMAGE
// Try to save the bitmap via wxImage handlers:
wxImage image = ConvertToImage(); wxImage image = ConvertToImage();
return image.Ok() && image.SaveFile(name, type); if (image.IsOk() && image.SaveFile(name, type))
#else // !wxUSE_IMAGE return true;
wxUnusedVar(name); #endif
wxUnusedVar(type); const char* type_name = NULL;
switch (type)
return false; {
#endif // wxUSE_IMAGE case wxBITMAP_TYPE_BMP: type_name = "bmp"; break;
case wxBITMAP_TYPE_ICO: type_name = "ico"; break;
case wxBITMAP_TYPE_JPEG: type_name = "jpeg"; break;
case wxBITMAP_TYPE_PNG: type_name = "png"; break;
default: break;
}
return type_name &&
gdk_pixbuf_save(GetPixbuf(), name.fn_str(), type_name, NULL, NULL);
} }
bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type ) bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
{ {
UnRef();
if (type == wxBITMAP_TYPE_XPM)
{
GdkBitmap *mask = NULL;
SetPixmap(gdk_pixmap_create_from_xpm(wxGetRootWindow()->window, &mask, NULL, name.fn_str()));
if (!M_BMPDATA)
return false; // do not set the mask
if (mask)
{
M_BMPDATA->m_mask = new wxMask;
M_BMPDATA->m_mask->m_bitmap = mask;
}
}
#if wxUSE_IMAGE #if wxUSE_IMAGE
else // try if wxImage can load it
{
wxImage image; wxImage image;
if (image.LoadFile(name, type) && image.Ok()) if (image.LoadFile(name, type) && image.IsOk())
CreateFromImage(image, -1); *this = wxBitmap(image);
else
#endif
{
UnRef();
GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(name.fn_str(), NULL);
if (pixbuf)
SetPixbuf(pixbuf);
} }
#endif // wxUSE_IMAGE
return IsOk(); return IsOk();
} }