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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/x11/bitmap.cpp
View File

@@ -91,7 +91,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
m_display = bitmap.GetDisplay();
wxImage image( bitmap );
wxImage image = bitmap.ConvertToImage();
if (!image.Ok()) return FALSE;
m_display = bitmap.GetDisplay();
@@ -1022,7 +1022,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal
// Try to save the bitmap via wxImage handlers:
{
wxImage image( *this );
wxImage image(this->ConvertToImage()) ;
if (image.Ok()) return image.SaveFile( name, type );
}
@@ -1111,7 +1111,7 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
{
wxImage image;
if (!image.LoadFile( name, type )) return FALSE;
if (image.Ok()) *this = image.ConvertToBitmap();
if (image.Ok()) *this = wxBitmap(image);
else return FALSE;
}