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

some ifdef's - now it might compile without wxUSE_IMAGE although not tested

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-04-23 23:31:42 +00:00
parent 08399e45e7
commit 6d51f22029
2 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/msw/bitmap.cpp
View File

@@ -350,6 +350,12 @@ bool wxBitmap::Create(int w, int h, int d)
return Ok();
}
// ----------------------------------------------------------------------------
// wxImage to/from conversions
// ----------------------------------------------------------------------------
#if wxUSE_IMAGE
bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
{
wxCHECK_MSG( image.Ok(), FALSE, wxT("invalid image") )
@@ -570,7 +576,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
// check the wxBitmap object
GetBitmapData()->SetOk();
#endif // WXWIN_COMPATIBILITY_2
if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
return TRUE;
@@ -579,7 +585,7 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
wxImage wxBitmap::ConvertToImage() const
{
wxImage image;
wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
// create an wxImage object
@@ -704,6 +710,8 @@ wxImage wxBitmap::ConvertToImage() const
return image;
}
#endif // wxUSE_IMAGE
bool wxBitmap::LoadFile(const wxString& filename, long type)
{
UnRef();
@@ -716,16 +724,20 @@ bool wxBitmap::LoadFile(const wxString& filename, long type)
return handler->LoadFile(this, filename, type, -1, -1);
}
#if wxUSE_IMAGE
else
{
wxImage image;
if ( !image.LoadFile( filename, type ) || !image.Ok() )
return FALSE;
if ( image.LoadFile( filename, type ) && image.Ok() )
{
*this = image.ConvertToBitmap();
*this = image.ConvertToBitmap();
return TRUE;
return TRUE;
}
}
#endif // wxUSE_IMAGE
return FALSE;
}
bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
@@ -754,15 +766,19 @@ bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *pal
{
return handler->SaveFile(this, filename, type, palette);
}
#if wxUSE_IMAGE
else
{
// FIXME what about palette? shouldn't we use it?
wxImage image( *this );
if (!image.Ok())
return FALSE;
return image.SaveFile( filename, type );
if ( image.Ok() )
{
return image.SaveFile(filename, type);
}
}
#endif // wxUSE_IMAGE
return FALSE;
}
// ----------------------------------------------------------------------------