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

Make wxBitmap inherit from wxBitmapBase

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-02-05 13:08:44 +00:00
parent 58b907f6e1
commit 4611dd06a1
7 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/bitmap.cpp
View File

@@ -1153,12 +1153,12 @@ wxImage wxBitmap::ConvertToImage() const
}
wxBitmap::wxBitmap( const wxBitmap& bmp )
: wxGDIObject()
: wxBitmapBase()
{
Ref( bmp );
}
wxBitmap::wxBitmap( const wxString &filename, int type )
wxBitmap::wxBitmap( const wxString &filename, wxBitmapType type )
{
LoadFile( filename, type );
}
@@ -1324,7 +1324,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
return ret;
}
bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(palette) )
bool wxBitmap::SaveFile( const wxString &name, wxBitmapType type, const wxPalette *WXUNUSED(palette) ) const
{
wxCHECK_MSG( Ok(), FALSE, wxT("invalid bitmap") );
@@ -1337,7 +1337,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal
return FALSE;
}
bool wxBitmap::LoadFile( const wxString &name, int type )
bool wxBitmap::LoadFile( const wxString &name, wxBitmapType type )
{
UnRef();
@@ -1390,6 +1390,11 @@ wxPalette *wxBitmap::GetPalette() const
return M_BMPDATA->m_palette;
}
void wxBitmap::SetPalette(const wxPalette& WXUNUSED(palette))
{
// TODO
}
void wxBitmap::SetHeight( int height )
{
if (!m_refData)