include wx/arrstr.h as it's needed by wxImageHandler and may not be implicitly includ...

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

diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index a63e63dea85d5739ed642cd59b58b9dd577c8dcf..95502800c79324f26741cf6a53083758e778ecc8 100644 (file)
--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@@ -79,7 +79,7 @@ public:
     // program startup
     virtual bool OnInit();
 
-    // 2nd-level exception handling: we get all the exceptions occuring in any
+    // 2nd-level exception handling: we get all the exceptions occurring in any
     // event handler here
     virtual bool OnExceptionInMainLoop();
 
@@ -123,6 +123,8 @@ public:
     void OnHandleCrash(wxCommandEvent& event);
 #endif
 
+protected:
+
     // 1st-level exception handling: we overload ProcessEvent() to be able to
     // catch exceptions which occur in MyFrame methods here
     virtual bool ProcessEvent(wxEvent& event);
@@ -238,6 +240,9 @@ IMPLEMENT_APP(MyApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
     // create the main application window
     MyFrame *frame = new MyFrame();
 
@@ -472,8 +477,7 @@ MyDialog::MyDialog(wxFrame *parent)
     sizerTop->Add(new wxButton(this, wxID_CANCEL, _T("&Cancel")),
                   0, wxCENTRE | wxALL, 5);
 
-    SetSizer(sizerTop);
-    sizerTop->Fit(this);
+    SetSizerAndFit(sizerTop);
 }
 
 void MyDialog::OnThrowInt(wxCommandEvent& WXUNUSED(event))