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

removed deprecated ConvertToBitmap() and wxImage(wxBitmap) ctor

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-06-18 21:38:29 +00:00
parent dc6c9679d6
commit c631d59053
2 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/image.h
View File

@@ -153,15 +153,6 @@ public:
wxImage( const wxImage& image ); wxImage( const wxImage& image );
wxImage( const wxImage* image ); wxImage( const wxImage* image );
#if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
// conversion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
wxDEPRECATED( wxImage(const wxBitmap &bitmap) );
wxDEPRECATED( wxBitmap ConvertToBitmap() const );
#ifdef __WXGTK__
wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
#endif
#endif
bool Create( int width, int height, bool clear = true ); bool Create( int width, int height, bool clear = true );
bool Create( int width, int height, unsigned char* data, bool static_data = FALSE ); bool Create( int width, int height, unsigned char* data, bool static_data = FALSE );
void Destroy(); void Destroy();

31
src/common/image.cpp
View File

@@ -1468,37 +1468,6 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
#endif // wxUSE_STREAMS #endif // wxUSE_STREAMS
//-----------------------------------------------------------------------------
// Deprecated wxBitmap conversion routines
//-----------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
#ifdef __WXGTK__
wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const
{
wxImage mono = this->ConvertToMono( red, green, blue );
wxBitmap bitmap( mono, 1 );
return bitmap;
}
#endif
wxBitmap wxImage::ConvertToBitmap() const
{
wxBitmap bitmap( *this );
return bitmap;
}
wxImage::wxImage( const wxBitmap &bitmap )
{
*this = bitmap.ConvertToImage();
}
#endif // WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// image histogram stuff // image histogram stuff
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------