Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No real changes, just remove __WXDEBUG__ tests.

Browse Source 
These tests are unnecessary now because asserts are almost always enabled. We
could test for wxDEBUG_LEVEL but the code still compiles even if it's defined
as 0 so there doesn't seem to be any need for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-12-09 14:59:01 +00:00
parent 5cd3213b65
commit 5ceb93670c
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/except/except.cpp
View File

@@ -128,10 +128,8 @@ protected:
// catch exceptions which occur in MyFrame methods here // catch exceptions which occur in MyFrame methods here
virtual bool ProcessEvent(wxEvent& event); virtual bool ProcessEvent(wxEvent& event);
#ifdef __WXDEBUG__
// show how an assert failure message box looks like // show how an assert failure message box looks like
void OnShowAssert(wxCommandEvent& event); void OnShowAssert(wxCommandEvent& event);
#endif // __WXDEBUG__
private: private:
// any class wishing to process wxWidgets events must use this macro // any class wishing to process wxWidgets events must use this macro
@@ -186,9 +184,7 @@ enum
#if wxUSE_ON_FATAL_EXCEPTION #if wxUSE_ON_FATAL_EXCEPTION
Except_HandleCrash, Except_HandleCrash,
#endif // wxUSE_ON_FATAL_EXCEPTION #endif // wxUSE_ON_FATAL_EXCEPTION
#ifdef __WXDEBUG__
Except_ShowAssert, Except_ShowAssert,
#endif // __WXDEBUG__
Except_Dialog, Except_Dialog,
Except_Quit = wxID_EXIT, Except_Quit = wxID_EXIT,
@@ -214,9 +210,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
#if wxUSE_ON_FATAL_EXCEPTION #if wxUSE_ON_FATAL_EXCEPTION
EVT_MENU(Except_HandleCrash, MyFrame::OnHandleCrash) EVT_MENU(Except_HandleCrash, MyFrame::OnHandleCrash)
#endif // wxUSE_ON_FATAL_EXCEPTION #endif // wxUSE_ON_FATAL_EXCEPTION
#ifdef __WXDEBUG__
EVT_MENU(Except_ShowAssert, MyFrame::OnShowAssert) EVT_MENU(Except_ShowAssert, MyFrame::OnShowAssert)
#endif // __WXDEBUG__
END_EVENT_TABLE() END_EVENT_TABLE()
BEGIN_EVENT_TABLE(MyDialog, wxDialog) BEGIN_EVENT_TABLE(MyDialog, wxDialog)
@@ -348,10 +342,8 @@ MyFrame::MyFrame()
menuFile->AppendCheckItem(Except_HandleCrash, wxT("&Handle crashes\tCtrl-H")); menuFile->AppendCheckItem(Except_HandleCrash, wxT("&Handle crashes\tCtrl-H"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
#endif // wxUSE_ON_FATAL_EXCEPTION #endif // wxUSE_ON_FATAL_EXCEPTION
#ifdef __WXDEBUG__
menuFile->Append(Except_ShowAssert, wxT("Provoke &assert failure\tCtrl-A")); menuFile->Append(Except_ShowAssert, wxT("Provoke &assert failure\tCtrl-A"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
#endif // __WXDEBUG__
menuFile->Append(Except_Quit, wxT("E&xit\tCtrl-Q"), wxT("Quit this program")); menuFile->Append(Except_Quit, wxT("E&xit\tCtrl-Q"), wxT("Quit this program"));
wxMenu *helpMenu = new wxMenu; wxMenu *helpMenu = new wxMenu;
@@ -444,8 +436,6 @@ void MyFrame::OnHandleCrash(wxCommandEvent& event)
#endif // wxUSE_ON_FATAL_EXCEPTION #endif // wxUSE_ON_FATAL_EXCEPTION
#ifdef __WXDEBUG__
void MyFrame::OnShowAssert(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnShowAssert(wxCommandEvent& WXUNUSED(event))
{ {
// provoke an assert from wxArrayString // provoke an assert from wxArrayString
@@ -453,8 +443,6 @@ void MyFrame::OnShowAssert(wxCommandEvent& WXUNUSED(event))
arr[0]; arr[0];
} }
#endif // __WXDEBUG__
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{ {
wxString msg; wxString msg;