Have support for both char* and wchar_t* in wxPGPropArg. Moved wxPGPropArgCls member...

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

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index 557f0a1ef952eb74353314ffafa3a1fddd4f8a60..31b3f4c2e09497191b8af30d76a2f7b5da12096f 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -368,6 +368,9 @@ MyApp::MyApp()
 
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
 #if wxUSE_LIBPNG
     wxImage::AddHandler( new wxPNGHandler );
 #endif
@@ -382,15 +385,12 @@ bool MyApp::OnInit()
 
     wxString rootName(_T("shape0"));
 
-    int i;
-    for (i = 1; i < 4; i++)
+    for (int i = 1; i < 4; 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. */
-        if (image.LoadFile(filename, wxBITMAP_TYPE_PNG))
+        if (image.LoadFile(wxString::Format("%s%d.png", rootName, i), wxBITMAP_TYPE_PNG))
         {
             DragShape* newShape = new DragShape(wxBitmap(image));
             newShape->SetPosition(wxPoint(i*50, i*50));