]> git.saurik.com Git - wxWidgets.git/commitdiff
removed deprecated ConvertToBitmap() and wxImage(wxBitmap) ctor
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 18 Jun 2003 21:38:29 +0000 (21:38 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 18 Jun 2003 21:38:29 +0000 (21:38 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/image.h
src/common/image.cpp

index 9253a4bdb41cd6e8591ab7bfdeed3e1262800ac0..1d30b7a8f12502a3681ced91160aba25fb034728 100644 (file)
@@ -153,15 +153,6 @@ public:
     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, unsigned char* data, bool static_data = FALSE );
     void Destroy();
index 10035ce9653fad70c0b0635ccae66715d56da02a..179dae70ec0d2ec82f8a4dff5e533c5b6af89022 100644 (file)
@@ -1468,37 +1468,6 @@ bool wxImageHandler::CallDoCanRead(wxInputStream& stream)
 
 #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
 // ----------------------------------------------------------------------------