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

compilation fixes for wxUSE_IMAGE==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-07-11 00:02:11 +00:00
parent 3c029873c6
commit c052164410
5 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/bitmap.cpp
View File

@@ -363,6 +363,8 @@ wxBitmap wxBitmap::Rescale(int clipx, int clipy, int clipwidth, int clipheight,
return bmp;
}
#if wxUSE_IMAGE
bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
{
UnRef();
@@ -593,6 +595,8 @@ wxImage wxBitmap::ConvertToImage() const
return image;
}
#endif // wxUSE_IMAGE
bool wxBitmap::IsOk() const
{
return (m_refData != NULL) &&
@@ -692,9 +696,13 @@ bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalett
{
wxCHECK_MSG( Ok(), false, wxT("invalid bitmap") );
#if wxUSE_IMAGE
// Try to save the bitmap via wxImage handlers:
wxImage image = ConvertToImage();
return image.Ok() && image.SaveFile(name, type);
#else // !wxUSE_IMAGE
return false;
#endif // wxUSE_IMAGE
}
bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
@@ -712,12 +720,14 @@ bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
M_BMPDATA->m_mask->m_bitmap = mask;
}
}
#if wxUSE_IMAGE
else // try if wxImage can load it
{
wxImage image;
if (image.LoadFile(name, type) && image.Ok())
CreateFromImage(image, -1);
}
#endif // wxUSE_IMAGE
return Ok();
}
@@ -786,7 +796,7 @@ GdkPixmap *wxBitmap::GetPixmap() const
gdk_pixbuf_render_pixmap_and_mask(M_BMPDATA->m_pixbuf,
&M_BMPDATA->m_pixmap,
pmask,
wxIMAGE_ALPHA_THRESHOLD);
0x80 /* alpha threshold */);
}
return M_BMPDATA->m_pixmap;