X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e334d0eac863deef820a2ebba26559892023a5fb..ab0d42f76d5594bd28fdcad35bedeb380902f3ea:/samples/dragimag/dragimag.cpp diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp index 7f169d5d1d..aa00bf12f3 100644 --- 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(); @@ -394,12 +394,12 @@ bool MyApp::OnInit() { 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)) { - DragShape* newShape = new DragShape(image.ConvertToBitmap()); + DragShape* newShape = new DragShape(wxBitmap(image)); newShape->SetPosition(wxPoint(i*50, i*50)); if (i == 2)