use libtiff/libjpeg VC-specific include files for all Win32 compilers, including...

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

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 7727a33fb44274f60ad3bcb7ce319e1bf9e28acf..49336c75f546fcd489095aeee6f6ee0f9d984c95 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -32,7 +32,8 @@
 #include "wx/toolbar.h"
 
 #if !defined(__WXMSW__)
-    #include "mondrian.xpm"
+    #include "../sample.xpm"
+    #include "chart.xpm"
 #endif
 
 #include "bitmaps/new.xpm"
@@ -111,6 +112,9 @@ END_EVENT_TABLE()
 // Initialise this in OnInit, not statically
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // Create the main frame window
 
     frame = new MyFrame((wxFrame *)NULL, wxID_ANY, _T("MDI Demo"),
@@ -263,11 +267,6 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     subframe->SetMenuBar(menu_bar);
 #endif // wxUSE_MENUS
 
-#if wxUSE_STATUSBAR
-    subframe->CreateStatusBar();
-    subframe->SetStatusText(title);
-#endif // wxUSE_STATUSBAR
-
     int width, height;
     subframe->GetClientSize(&width, &height);
     MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));