fixed typo in wxString::swap() which was completely broken

[wxWidgets.git] / samples / dragimag / dragimag.cpp

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index 7f169d5d1deb8c33e83b2661fc00c12243072fd6..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))
     {
     wxImage image;
     if (image.LoadFile("backgrnd.png", wxBITMAP_TYPE_PNG))
     {

-        m_background = image.ConvertToBitmap();
+        m_background = wxBitmap(image);

     }
 
     MyFrame *frame = new MyFrame();
     }
 
     MyFrame *frame = new MyFrame();


@@ -394,12 +394,12 @@ bool MyApp::OnInit()
     {
         wxString filename;
         filename.Printf(wxT("%s%d.png"), (const wxChar*)rootName, i);
     {
         wxString filename;
         filename.Printf(wxT("%s%d.png"), (const wxChar*)rootName, i);

-       /* For some reason under wxX11, the 2nd LoadFile in this loop fails, with
-          a BadMatch inside CreateFromImage (inside ConvertToBitmap). This happens even if you copy
-          the first file over the second file. */
+    /* For some reason under wxX11, the 2nd LoadFile in this loop fails, with
+       a BadMatch inside CreateFromImage (inside ConvertToBitmap). This happens even if you copy
+       the first file over the second file. */

         if (image.LoadFile(filename, wxBITMAP_TYPE_PNG))
         {
         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)
             newShape->SetPosition(wxPoint(i*50, i*50));
 
             if (i == 2)