[lmi-commits] (no subject)

[Greg Chicares]

branch: master
commit 5a0003dac84f78c683aff69666b00b3d9742df66
Author: Gregory W. Chicares <address@hidden>
Date:   Thu Jun 9 20:32:30 2016 +0000

    Upgrade wx
    
    This is a prerequisite for the next commit.
    
    See
      http://lists.nongnu.org/archive/html/lmi/2016-06/msg00041.html
    for a discussion of the changes to 'wx_checks.cpp'.
---
 install_wx.make |    6 ++++--
 wx_checks.cpp   |   12 ------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/install_wx.make b/install_wx.make
index 832390b..f2129ef 100644
--- a/install_wx.make
+++ b/install_wx.make
@@ -66,8 +66,10 @@ ifneq ($(use_git), N)
 # wx_md5            := ac28a959aabe36e26ea039ed78a51b54
 # wx_commit_sha     := 730c1ee79b77b3eab58881492b2de6b659319ba2
 # wx_md5            := 1ce7f42362ba3075eeb4be4679f88dd3
-  wx_commit_sha     := 4475fe36a54cd62457dcd73c8739b1e7d46e1cde
-  wx_md5            := 47e4a36d8164ec4c69cab68a3d05f951
+# wx_commit_sha     := 4475fe36a54cd62457dcd73c8739b1e7d46e1cde
+# wx_md5            := 47e4a36d8164ec4c69cab68a3d05f951
+  wx_commit_sha     := c4d06e8117f8930b57bffaf6a3323007c9df8d4b
+  wx_md5            := 97e6a75d1a83e5597942741f8382c3d4
 
   wx_version        := $(wx_commit_sha)
 
diff --git a/wx_checks.cpp b/wx_checks.cpp
index b3208eb..0f1fb2a 100644
--- a/wx_checks.cpp
+++ b/wx_checks.cpp
@@ -65,18 +65,6 @@
 #   error Disable wxUSE_GIF in wx setup.
 #endif // wxUSE_GIF
 
-#if defined __GNUC__ && defined LMI_MSW
-// Not yet implemented for gcc on the msw platform.
-#   if wxUSE_ON_FATAL_EXCEPTION
-#       error Disable wxUSE_ON_FATAL_EXCEPTION in wx setup.
-#   endif // wxUSE_ON_FATAL_EXCEPTION
-
-// Not yet implemented for gcc on the msw platform.
-#   if wxUSE_STACKWALKER
-#       error Disable wxUSE_STACKWALKER in wx setup.
-#   endif // wxUSE_STACKWALKER
-#endif // defined __GNUC__ && defined LMI_MSW
-
 // This application is single threaded, and wasn't designed to be
 // thread safe. It might work perfectly well if compiled with thread
 // support enabled (but not used), but that has never been tested, and