X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/532c773634cccf5c19f42aac5d2425ed3e7bb12a..226c11c0767b3dfded410b8c8be8cf0d9444d136:/samples/except/except.cpp

diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index 6f8a0acbbe..f5423780ab 100644
--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        except.cpp
-// Purpose:     Except wxWindows sample
-// Author:      Julian Smart
+// Name:        samples/except/except.cpp
+// Purpose:     shows how C++ exceptions can be used in wxWidgets
+// Author:      Vadim Zeitlin
 // Modified by:
-// Created:     04/01/98
+// Created:     2003-09-17
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
+// Copyright:   (c) 2003-2005 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -24,8 +24,12 @@
     #pragma hdrstop
 #endif
 
+#if !wxUSE_EXCEPTIONS
+    #error "This sample only works with wxUSE_EXCEPTIONS == 1"
+#endif // !wxUSE_EXCEPTIONS
+
 // 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"
 
@@ -37,7 +41,9 @@
     #include "wx/button.h"
     #include "wx/sizer.h"
 
-    #include "wx/utils.h"               // for wxMessageBox
+    #include "wx/utils.h"
+    #include "wx/msgdlg.h"
+    #include "wx/icon.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -93,7 +99,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()
 };
 
@@ -106,6 +112,7 @@ public:
     // event handlers
     void OnThrowInt(wxCommandEvent& event);
     void OnThrowObject(wxCommandEvent& event);
+    void OnCrash(wxCommandEvent& event);
 
 private:
     DECLARE_EVENT_TABLE()
@@ -133,6 +140,7 @@ enum
     // control ids
     Except_ThrowInt = 100,
     Except_ThrowObject,
+    Except_Crash,
 
     // menu items
     Except_ThrowString = 200,
@@ -143,10 +151,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)
@@ -159,9 +167,10 @@ END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
     EVT_BUTTON(Except_ThrowInt, MyDialog::OnThrowInt)
     EVT_BUTTON(Except_ThrowObject, MyDialog::OnThrowObject)
+    EVT_BUTTON(Except_Crash, MyDialog::OnCrash)
 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
@@ -176,7 +185,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
@@ -216,10 +225,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
@@ -244,7 +253,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
 }
 
@@ -270,9 +279,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))
@@ -294,7 +311,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);
 
@@ -302,6 +319,8 @@ MyDialog::MyDialog(wxFrame *parent)
                   0, wxCENTRE | wxALL, 5);
     sizerTop->Add(new wxButton(this, Except_ThrowObject, _T("Throw &object")),
                   0, wxCENTRE | wxALL, 5);
+    sizerTop->Add(new wxButton(this, Except_Crash, _T("&Crash")),
+                  0, wxCENTRE | wxALL, 5);
     sizerTop->Add(new wxButton(this, wxID_CANCEL, _T("&Cancel")),
                   0, wxCENTRE | wxALL, 5);
 
@@ -319,3 +338,9 @@ void MyDialog::OnThrowObject(wxCommandEvent& WXUNUSED(event))
     throw MyException(_T("Exception thrown from the dialog"));
 }
 
+void MyDialog::OnCrash(wxCommandEvent& WXUNUSED(event))
+{
+    char *p = 0;
+    strcpy(p, "Let's crash");
+}
+