extracted MSW-specific setup.h options to their own wx/msw/setup_inc.h file which...

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

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index dbad7666917e09739b491a4fbf47b20cd94270e9..49336c75f546fcd489095aeee6f6ee0f9d984c95 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -112,6 +112,9 @@ END_EVENT_TABLE()
 // Initialise this in OnInit, not statically
 bool MyApp::OnInit()
 {
 // 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"),
     // Create the main frame window
 
     frame = new MyFrame((wxFrame *)NULL, wxID_ANY, _T("MDI Demo"),


@@ -264,11 +267,6 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     subframe->SetMenuBar(menu_bar);
 #endif // wxUSE_MENUS
 
     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));
     int width, height;
     subframe->GetClientSize(&width, &height);
     MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height));