From 31fc2c14e43503b9291c133e5808dc905666d3cc Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Thu, 8 Oct 2015 17:35:14 -0700 Subject: [PATCH] This corrects the debugging level used when building the wxWidgets libs on Windows. It will disable the assertions in release builds. --- win/wxWidgets_additions/accessibility.diff | 24 +++++++++++++++---- .../wxWidgets-3.0.2/include/wx/msw/setup.h | 10 ++++---- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/win/wxWidgets_additions/accessibility.diff b/win/wxWidgets_additions/accessibility.diff index 1425748c7..923f51ca3 100644 --- a/win/wxWidgets_additions/accessibility.diff +++ b/win/wxWidgets_additions/accessibility.diff @@ -1,12 +1,28 @@ -diff -wruN orig/wxWidgets-3.0.2/include/wx/msw/setup.h wxWidgets-3.0.2/include/wx/msw/setup.h ---- orig/include/wx/msw/setup.h 2014-10-06 16:33:44.000000000 -0500 -+++ include/wx/msw/setup.h 2014-10-14 18:38:37.992586000 -0500 +--- orig/include/wx/msw/setup.h 2014-10-06 14:33:44.000000000 -0700 ++++ include/wx/msw/setup.h 2015-10-08 17:32:21.223729900 -0700 +@@ -65,11 +65,11 @@ + // NDEBUG) or, on the contrary, enable more asserts, including the usually + // disabled ones, in the debug build (then do it inside #ifndef NDEBUG) + // +-// #ifdef NDEBUG +-// #define wxDEBUG_LEVEL 0 +-// #else +-// #define wxDEBUG_LEVEL 2 +-// #endif ++#ifdef NDEBUG ++ #define wxDEBUG_LEVEL 0 ++#else ++ #define wxDEBUG_LEVEL 1 ++#endif + + // wxHandleFatalExceptions() may be used to catch the program faults at run + // time and, instead of terminating the program with a usual GPF message box, @@ -1366,7 +1366,7 @@ // Default is 0. // // Recommended setting (at present): 0 -#define wxUSE_ACCESSIBILITY 0 +#define wxUSE_ACCESSIBILITY 1 - + // ---------------------------------------------------------------------------- // miscellaneous settings diff --git a/win/wxWidgets_additions/wxWidgets-3.0.2/include/wx/msw/setup.h b/win/wxWidgets_additions/wxWidgets-3.0.2/include/wx/msw/setup.h index e6ca4d861..39ae61f9f 100644 --- a/win/wxWidgets_additions/wxWidgets-3.0.2/include/wx/msw/setup.h +++ b/win/wxWidgets_additions/wxWidgets-3.0.2/include/wx/msw/setup.h @@ -65,11 +65,11 @@ // NDEBUG) or, on the contrary, enable more asserts, including the usually // disabled ones, in the debug build (then do it inside #ifndef NDEBUG) // -// #ifdef NDEBUG -// #define wxDEBUG_LEVEL 0 -// #else -// #define wxDEBUG_LEVEL 2 -// #endif +#ifdef NDEBUG + #define wxDEBUG_LEVEL 0 +#else + #define wxDEBUG_LEVEL 1 +#endif // wxHandleFatalExceptions() may be used to catch the program faults at run // time and, instead of terminating the program with a usual GPF message box,