Removed a deprecated wxBitmap constructor, and some

[wxWidgets.git] / src / x11 / bitmap.cpp

diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp
index 38f8aba90aa5190be4e6d83baf921cc29c945f39..8663744e469ec32cf5ec2d45bf01a7bd6ed86aea 100644 (file)
--- a/src/x11/bitmap.cpp
+++ b/src/x11/bitmap.cpp
@@ -91,7 +91,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
 
     m_display = bitmap.GetDisplay();
 
 
     m_display = bitmap.GetDisplay();
 

-    wxImage image( bitmap );
+    wxImage image = bitmap.ConvertToImage();

     if (!image.Ok()) return FALSE;
     
     m_display = bitmap.GetDisplay();
     if (!image.Ok()) return FALSE;
     
     m_display = bitmap.GetDisplay();


@@ -1022,7 +1022,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal
 
     // Try to save the bitmap via wxImage handlers:
     {
 
     // Try to save the bitmap via wxImage handlers:
     {

-        wxImage image( *this );
+        wxImage image(this->ConvertToImage()) ;

         if (image.Ok()) return image.SaveFile( name, type );
     }
 
         if (image.Ok()) return image.SaveFile( name, type );
     }
 


@@ -1111,7 +1111,7 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
     {
         wxImage image;
         if (!image.LoadFile( name, type )) return FALSE;
     {
         wxImage image;
         if (!image.LoadFile( name, type )) return FALSE;

-        if (image.Ok()) *this = image.ConvertToBitmap();
+        if (image.Ok()) *this = wxBitmap(image);

         else return FALSE;
     }
 
         else return FALSE;
     }