From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 18 Jun 2003 21:38:29 +0000 (+0000)
Subject: removed deprecated ConvertToBitmap() and wxImage(wxBitmap) ctor
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c631d59053920f7c506c1d624a7811f3919d248d

removed deprecated ConvertToBitmap() and wxImage(wxBitmap) ctor


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/image.h b/include/wx/image.h
index 9253a4bdb4..1d30b7a8f1 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -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();
diff --git a/src/common/image.cpp b/src/common/image.cpp
index 10035ce965..179dae70ec 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -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
 // ----------------------------------------------------------------------------