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

don't use deprecated wxImage methods inside wxWin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-03-24 00:22:15 +00:00
parent a460c732db
commit 368d59f0d8
19 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gtk/bitmap.cpp
View File

@@ -99,7 +99,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
m_bitmap = (GdkBitmap*) NULL;
}
wxImage image( bitmap );
wxImage image = bitmap.ConvertToImage();
if (!image.Ok()) return FALSE;
m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
@@ -954,7 +954,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 = ConvertToImage();
if (image.Ok()) return image.SaveFile( name, type );
}
@@ -991,7 +991,8 @@ 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;
}