don't use deprecated wxImage methods inside wxWin

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

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 42e7ead5278f2ecafedb2e9b34dcfb5a15066d8b..9af14885d2bec1d2f95d4fb80758f9197d80f622 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -1217,7 +1217,7 @@ void DnDFrame::OnCopyBitmap(wxCommandEvent& WXUNUSED(event))
     wxLogStatus( _T("Decoding image file...") );
     wxYield();
 
-    wxBitmap bitmap( image.ConvertToBitmap() );
+    wxBitmap bitmap( image );
 
     if ( !wxTheClipboard->Open() )
     {

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index 13a4f500855a8ad0350ffe138cbc821d16b2b050..aa00bf12f3f98a92b985f073e370a1510dad5f3f 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -382,7 +382,7 @@ bool MyApp::OnInit()
     wxImage image;
     if (image.LoadFile("backgrnd.png", wxBITMAP_TYPE_PNG))
     {
-        m_background = image.ConvertToBitmap();
+        m_background = wxBitmap(image);
     }
 
     MyFrame *frame = new MyFrame();
@@ -399,7 +399,7 @@ bool MyApp::OnInit()
        the first file over the second file. */
         if (image.LoadFile(filename, wxBITMAP_TYPE_PNG))
         {
-            DragShape* newShape = new DragShape(image.ConvertToBitmap());
+            DragShape* newShape = new DragShape(wxBitmap(image));
             newShape->SetPosition(wxPoint(i*50, i*50));
 
             if (i == 2)

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index d08a07585d4f430fdfd82f5a68183933ae320fda..262078f92c0773e3de1a066aa376afab19247b79 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -138,7 +138,7 @@ public:
 
     void OnSave(wxCommandEvent& WXUNUSED(event))
     {
-        wxImage image(m_bitmap);
+        wxImage image = m_bitmap.ConvertToImage();
 
         int bppselection = wxGetSingleChoiceIndex("Set BMP BPP",
                                                   "Set BMP BPP",
@@ -512,7 +512,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 2010, TRUE );
+        dc.DrawBitmap( wxBitmap(i), 150, 2010, TRUE );
         dc.SetTextForeground( wxT("BLACK") );
     }
 
@@ -549,7 +549,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 2130, TRUE );
+        dc.DrawBitmap( wxBitmap(i), 150, 2130, TRUE );
         dc.SetTextForeground( wxT("BLACK") );
     }
 
@@ -633,7 +633,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
        blue = blue/4;
        anti.SetRGB( x, y, red, green, blue );
     }
-  my_anti = new wxBitmap( anti.ConvertToBitmap() );
+  my_anti = new wxBitmap(anti);
 }
 
 // MyFrame
@@ -702,7 +702,7 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
         return;
     }
 
-    (new MyImageFrame(this, image.ConvertToBitmap()))->Show();
+    (new MyImageFrame(this, wxBitmap(image)))->Show();
 }
 
 //-----------------------------------------------------------------------------

diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp
index 2bdb6270e99fd3fb53d617641cc4a8f2b87eaa0a..2f26cf2a7ef9e237bd53b923d5d986bd621f4cfa 100644 (file)
--- a/samples/rotate/rotate.cpp
+++ b/samples/rotate/rotate.cpp
@@ -161,10 +161,10 @@ void MyCanvas::OnMouseLeftUp (wxMouseEvent & event)
     const wxImage& img = wxGetApp().GetImage();
     wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), TRUE, &offset);
 
-    wxBitmap bmp = img2.ConvertToBitmap ();
+    wxBitmap bmp(img2);
 
     wxClientDC dc (this);
-    dc.DrawBitmap (img2.ConvertToBitmap(), event.m_x + offset.x, event.m_y + offset.y, TRUE);
+    dc.DrawBitmap (bmp, event.m_x + offset.x, event.m_y + offset.y, TRUE);
 }
 
 // without interpolation, and without offset correction
@@ -175,7 +175,7 @@ void MyCanvas::OnMouseRightUp (wxMouseEvent & event)
     const wxImage& img = wxGetApp().GetImage();
     wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), FALSE);
 
-    wxBitmap bmp = img2.ConvertToBitmap ();
+    wxBitmap bmp(img2);
 
     wxClientDC dc (this);
     dc.DrawBitmap (bmp, event.m_x, event.m_y, TRUE);

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index e115cb6be7042312d2b697b6c541657b63c3337f..8adccafd3ad9f18b01be0f26e2ac5c24b36a85c7 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -274,7 +274,7 @@ void MyFrame::RecreateToolbar()
         for ( size_t n = 0; n < WXSIZEOF(toolBarBitmaps); n++ )
         {
             toolBarBitmaps[n] =
-                wxImage(toolBarBitmaps[n]).Scale(w, h).ConvertToBitmap();
+                wxBitmap(toolBarBitmaps[n].ConvertToImage().Scale(w, h));
         }
 
         toolBar->SetToolBitmapSize(wxSize(w, h));

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 4a7a80ded0836b1087c28340a05bf48eeb0e437b..2eed27fb7d73edc8903d8e311c7d03d249661a5f 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -669,8 +669,7 @@ void MyTreeCtrl::CreateImageList(int size)
         }
         else
         {
-            images->Add(wxImage(icons[i]).Rescale(size, size).
-                                    ConvertToBitmap());
+            images->Add(wxBitmap(icons[i].ConvertToImage().Rescale(size, size)));
         }
     }
 #endif // MSW/!MSW
@@ -714,8 +713,7 @@ void MyTreeCtrl::CreateButtonsImageList(int size)
         }
         else
         {
-            images->Add(wxImage(icons[i]).Rescale(size, size).
-                                    ConvertToBitmap());
+            images->Add(wxBitmap(icons[i].ConvertToImage().Rescale(size, size)));
         }
     }
 #endif // MSW/!MSW

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 2bfcfd02be1240efd3c5b24b75813cf44c2a16f4..93e51c7625bdcc14edadee29ff5690c76cebc272 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -174,7 +174,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxBitmap& bitmap, long type)
 {
-    wxImage img(bitmap);
+    wxImage img = bitmap.ConvertToImage();
     AddFile(filename, img, type);
 }
 

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index fd36a5b7833567119c6a5f1226e490c55fb7816d..a81806e5acf10a1a0747b766718c7830ad5c1798 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -881,7 +881,7 @@ void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y,
 
     if (!bitmap.Ok()) return;
 
-    wxImage image( bitmap );
+    wxImage image = bitmap.ConvertToImage();
 
     if (!image.Ok()) return;
 

diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp
index e7632a737c9166d9318728274660081d07d3c6eb..c1e5edca9de2e85b4a3821ce0352b89b2f601c46 100644 (file)
--- a/src/generic/dragimgg.cpp
+++ b/src/generic/dragimgg.cpp
@@ -164,9 +164,9 @@ bool wxGenericDragImage::Create(const wxString& str, const wxCursor& cursor)
 
 #if wxUSE_IMAGE_IN_DRAGIMAGE
     // Make the bitmap masked
-    wxImage image(bitmap);
+    wxImage image = bitmap.ConvertToImage();
     image.SetMaskColour(255, 255, 255);
-    bitmap = image.ConvertToBitmap();
+    bitmap = wxBitmap(image);
 #endif
 
     return Create(bitmap, cursor);

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 4f2629a4fa6c0297b4b602a8eadf5455407171a4..8245e153386f403f223ee2a15494a088d355ea94 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -263,7 +263,7 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
         p1 += 32 * 3, p2 += 32 * 3;
     }
 
-    return small.ConvertToBitmap();
+    return wxBitmap(small);
 }
 
 // finds empty borders and return non-empty area of image:
@@ -332,12 +332,12 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
         m_HashTable.Put(extension, new wxFileIconEntry(newid));
         return newid;
     }
-    wxImage img(ic);
+    wxImage img = ic.ConvertToImage();
     delete ft;
 
     int id = m_ImageList.GetImageCount();
     if (img.GetWidth() == 16 && img.GetHeight() == 16)
-        m_ImageList.Add(img.ConvertToBitmap());
+        m_ImageList.Add(wxBitmap(img));
     else
     {
         if (img.GetWidth() != 32 || img.GetHeight() != 32)

diff --git a/src/generic/imaglist.cpp b/src/generic/imaglist.cpp
index aa3a2922080ae0b27b0c18f1ca7f992a0d5c21b2..64995176e2728a5c001a81be0fa3a51cb41e5514 100644 (file)
--- a/src/generic/imaglist.cpp
+++ b/src/generic/imaglist.cpp
@@ -75,9 +75,9 @@ int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
 
 int wxImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
 {
-    wxImage img(bitmap);
+    wxImage img = bitmap.ConvertToImage();
     img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());
-    return Add(img.ConvertToBitmap());
+    return Add(wxBitmap(img));
 }
 
 const wxBitmap *wxImageList::GetBitmap( int index ) const

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 0a27495252cbc5770f2ea07224de6bd03d79891b..634273f99e71df99c7c753400a9de4beb5140c0f 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -99,7 +99,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
         m_bitmap = (GdkBitmap*) NULL;
     }
 
-    wxImage image( bitmap );
+    wxImage image = bitmap.ConvertToImage();
     if (!image.Ok()) return FALSE;
 
     m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
@@ -954,7 +954,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal
 
     // Try to save the bitmap via wxImage handlers:
     {
-        wxImage image( *this );
+        wxImage image = ConvertToImage();
         if (image.Ok()) return image.SaveFile( name, type );
     }
 
@@ -991,7 +991,8 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
     {
         wxImage image;
         if (!image.LoadFile( name, type )) return FALSE;
-        if (image.Ok()) *this = image.ConvertToBitmap();
+        if (image.Ok())
+            *this = wxBitmap(image);
         else return FALSE;
     }
 

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index cae5a43dfb53ba577c3a9f37eb1fd1704e8bc568..cfbf0deb8ac26dcbb17e949c212d5472c7657588 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -358,7 +358,7 @@ void wxBitmapDataObject::DoConvertToPng()
     wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
                  wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
 
-    wxImage image(m_bitmap);
+    wxImage image = m_bitmap.ConvertToImage();
 
     wxCountingOutputStream count;
     image.SaveFile(count, wxBITMAP_TYPE_PNG);

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 5cb5431280f31bfe96cc29e930450153e8c54eae..d7eee8e5dec280213ee27222a1eb2e04ae5ffc8c 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -416,7 +416,7 @@ bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
     memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
     memdc.SelectObject(wxNullBitmap);
 
-    wxImage image(bitmap);
+    wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     return TRUE;
 }
@@ -999,12 +999,12 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     wxBitmap use_bitmap;
     if ((w != ww) || (h != hh))
     {
-        wxImage image( bitmap );
+        wxImage image = bitmap.ConvertToImage();
         image.Rescale( ww, hh );
         if (is_mono)
-            use_bitmap = image.ConvertToMonoBitmap(255,255,255);
+            use_bitmap = wxBitmap(image.ConvertToMono(255,255,255), 1);
         else
-            use_bitmap = image.ConvertToBitmap();
+            use_bitmap = wxBitmap(image);
     }
     else
     {
@@ -1199,13 +1199,13 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
         if ((bm_width != bm_ww) || (bm_height != bm_hh))
         {
-            wxImage image( memDC->m_selected );
+            wxImage image = memDC->m_selected.ConvertToImage();
             image = image.Scale( bm_ww, bm_hh );
 
             if (is_mono)
-                use_bitmap = image.ConvertToMonoBitmap(255,255,255);
+                use_bitmap = wxBitmap(image.ConvertToMono(255,255,255), 1);
             else
-                use_bitmap = image.ConvertToBitmap();
+                use_bitmap = wxBitmap(image);
         }
         else
         {
@@ -1313,11 +1313,11 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
 
             /* scale image */
-            wxImage image( bitmap );
+            wxImage image = bitmap.ConvertToImage();
             image = image.Scale( ww, hh );
 
             /* convert to bitmap */
-            bitmap = image.ConvertToBitmap();
+            bitmap = wxBitmap(image);
 
             /* draw scaled bitmap */
             gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
@@ -1456,7 +1456,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
             minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
 
     // prepare to blit-with-rotate the bitmap to the DC
-    wxImage image(src);
+    wxImage image = src.ConvertToImage();
 
     GdkColor *colText = m_textForegroundColour.GetColor(),
              *colBack = m_textBackgroundColour.GetColor();

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 0a27495252cbc5770f2ea07224de6bd03d79891b..634273f99e71df99c7c753400a9de4beb5140c0f 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -99,7 +99,7 @@ bool wxMask::Create( const wxBitmap& bitmap,
         m_bitmap = (GdkBitmap*) NULL;
     }
 
-    wxImage image( bitmap );
+    wxImage image = bitmap.ConvertToImage();
     if (!image.Ok()) return FALSE;
 
     m_bitmap = gdk_pixmap_new( wxGetRootWindow()->window, image.GetWidth(), image.GetHeight(), 1 );
@@ -954,7 +954,7 @@ bool wxBitmap::SaveFile( const wxString &name, int type, wxPalette *WXUNUSED(pal
 
     // Try to save the bitmap via wxImage handlers:
     {
-        wxImage image( *this );
+        wxImage image = ConvertToImage();
         if (image.Ok()) return image.SaveFile( name, type );
     }
 
@@ -991,7 +991,8 @@ bool wxBitmap::LoadFile( const wxString &name, int type )
     {
         wxImage image;
         if (!image.LoadFile( name, type )) return FALSE;
-        if (image.Ok()) *this = image.ConvertToBitmap();
+        if (image.Ok())
+            *this = wxBitmap(image);
         else return FALSE;
     }
 

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index cae5a43dfb53ba577c3a9f37eb1fd1704e8bc568..cfbf0deb8ac26dcbb17e949c212d5472c7657588 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -358,7 +358,7 @@ void wxBitmapDataObject::DoConvertToPng()
     wxCHECK_RET( wxImage::FindHandler(wxBITMAP_TYPE_PNG) != NULL,
                  wxT("You must call wxImage::AddHandler(new wxPNGHandler); to be able to use clipboard with bitmaps!") );
 
-    wxImage image(m_bitmap);
+    wxImage image = m_bitmap.ConvertToImage();
 
     wxCountingOutputStream count;
     image.SaveFile(count, wxBITMAP_TYPE_PNG);

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 5cb5431280f31bfe96cc29e930450153e8c54eae..d7eee8e5dec280213ee27222a1eb2e04ae5ffc8c 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -416,7 +416,7 @@ bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
     memdc.Blit(0, 0, 1, 1, (wxDC*) this, x1, y1);
     memdc.SelectObject(wxNullBitmap);
 
-    wxImage image(bitmap);
+    wxImage image = bitmap.ConvertToImage();
     col->Set(image.GetRed(0, 0), image.GetGreen(0, 0), image.GetBlue(0, 0));
     return TRUE;
 }
@@ -999,12 +999,12 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
     wxBitmap use_bitmap;
     if ((w != ww) || (h != hh))
     {
-        wxImage image( bitmap );
+        wxImage image = bitmap.ConvertToImage();
         image.Rescale( ww, hh );
         if (is_mono)
-            use_bitmap = image.ConvertToMonoBitmap(255,255,255);
+            use_bitmap = wxBitmap(image.ConvertToMono(255,255,255), 1);
         else
-            use_bitmap = image.ConvertToBitmap();
+            use_bitmap = wxBitmap(image);
     }
     else
     {
@@ -1199,13 +1199,13 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
 
         if ((bm_width != bm_ww) || (bm_height != bm_hh))
         {
-            wxImage image( memDC->m_selected );
+            wxImage image = memDC->m_selected.ConvertToImage();
             image = image.Scale( bm_ww, bm_hh );
 
             if (is_mono)
-                use_bitmap = image.ConvertToMonoBitmap(255,255,255);
+                use_bitmap = wxBitmap(image.ConvertToMono(255,255,255), 1);
             else
-                use_bitmap = image.ConvertToBitmap();
+                use_bitmap = wxBitmap(image);
         }
         else
         {
@@ -1313,11 +1313,11 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             gdk_gc_set_subwindow( m_penGC, GDK_CLIP_BY_CHILDREN );
 
             /* scale image */
-            wxImage image( bitmap );
+            wxImage image = bitmap.ConvertToImage();
             image = image.Scale( ww, hh );
 
             /* convert to bitmap */
-            bitmap = image.ConvertToBitmap();
+            bitmap = wxBitmap(image);
 
             /* draw scaled bitmap */
             gdk_draw_pixmap( m_window, m_penGC, bitmap.GetPixmap(), 0, 0, xx, yy, -1, -1 );
@@ -1456,7 +1456,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
             minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
 
     // prepare to blit-with-rotate the bitmap to the DC
-    wxImage image(src);
+    wxImage image = src.ConvertToImage();
 
     GdkColor *colText = m_textForegroundColour.GetColor(),
              *colBack = m_textBackgroundColour.GetColor();

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 99e68671019e338a8dad1c9d5cb4431c79ca8efb..086d47218379ac1ff59814dbe216f7eee4e328ac 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -948,7 +948,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type)
         wxImage image;
         if ( image.LoadFile( filename, type ) && image.Ok() )
         {
-            *this = image.ConvertToBitmap();
+            *this = wxBitmap(image);
 
             return TRUE;
         }
@@ -990,7 +990,7 @@ bool wxBitmap::SaveFile(const wxString& filename,
     else
     {
         // FIXME what about palette? shouldn't we use it?
-        wxImage image( *this );
+        wxImage image = ConvertToImage();
         if ( image.Ok() )
         {
             return image.SaveFile(filename, type);

diff --git a/src/msw/dragimag.cpp b/src/msw/dragimag.cpp
index ababd9e7cd092951c5fb30b65823a08a1ccf47c7..c94a7d33d91cd59d341ce8ddd7ec88755d822fa5 100644 (file)
--- a/src/msw/dragimag.cpp
+++ b/src/msw/dragimag.cpp
@@ -222,11 +222,9 @@ bool wxDragImage::Create(const wxString& str, const wxCursor& cursor)
     dc2.SelectObject(wxNullBitmap);
 
     // Make the bitmap masked
-    wxImage image(bitmap);
+    wxImage image = bitmap.ConvertToImage();
     image.SetMaskColour(255, 255, 255);
-    bitmap = image.ConvertToBitmap();
-
-    return Create(bitmap, cursor);
+    return Create(wxBitmap(image), cursor);
 }
 
 // Create a drag image for the given tree control item