X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/556b8c1aab20985774000e1695e638539153edd7..320700213165fc9d163f3a361fce12dc6a796fa3:/samples/except/except.cpp?ds=sidebyside

diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index 11972994af..aa217e4afa 100644
--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        except.cpp
-// Purpose:     Except wxWindows sample
+// Purpose:     Except wxWidgets sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
@@ -25,16 +25,20 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
+    #include "wx/log.h"
+
     #include "wx/app.h"
     #include "wx/frame.h"
     #include "wx/dialog.h"
+    #include "wx/menu.h"
 
     #include "wx/button.h"
     #include "wx/sizer.h"
 
-    #include "wx/utils.h"               // for wxMessageBox
+    #include "wx/utils.h"
+    #include "wx/msgdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -90,7 +94,7 @@ public:
     virtual bool ProcessEvent(wxEvent& event);
 
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
@@ -140,10 +144,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -158,7 +162,7 @@ BEGIN_EVENT_TABLE(MyDialog, wxDialog)
     EVT_BUTTON(Except_ThrowObject, MyDialog::OnThrowObject)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -173,7 +177,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // create the main application window
-    MyFrame *frame = new MyFrame(_T("Except wxWindows App"),
+    MyFrame *frame = new MyFrame(_T("Except wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // and show it (the frames, unlike simple controls, are not shown when
@@ -213,10 +217,10 @@ void MyApp::OnUnhandledException()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
-       : wxFrame(NULL, -1, title, pos, size, style)
+       : wxFrame(NULL, wxID_ANY, title, pos, size, style)
 {
     // set the frame icon
-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));
 
 #if wxUSE_MENUS
     // create a menu bar
@@ -241,7 +245,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 #if wxUSE_STATUSBAR && !defined(__WXWINCE__)
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWindows!"));
+    SetStatusText(_T("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 }
 
@@ -267,9 +271,17 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnDialog(wxCommandEvent& WXUNUSED(event))
 {
-    MyDialog dlg(this);
+    try
+    {
+        MyDialog dlg(this);
 
-    dlg.ShowModal();
+        dlg.ShowModal();
+    }
+    catch ( ... )
+    {
+        Destroy();
+        throw;
+    }
 }
 
 void MyFrame::OnThrowString(wxCommandEvent& WXUNUSED(event))
@@ -291,7 +303,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 // ============================================================================
 
 MyDialog::MyDialog(wxFrame *parent)
-        : wxDialog(parent, -1, wxString(_T("Throw exception dialog")))
+        : wxDialog(parent, wxID_ANY, wxString(_T("Throw exception dialog")))
 {
     wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);