From 0235c80859d0240163a216053ade798c2d340070 Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Wed, 2 Sep 2015 02:24:15 -0500
Subject: [PATCH] Fix for bug #936 part 2

Keeping this one separate in case we need to back it out.
---
 lib-src/mod-nyq-bench/NyqBench.cpp | 4 ++--
 lib-src/mod-nyq-bench/NyqBench.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib-src/mod-nyq-bench/NyqBench.cpp b/lib-src/mod-nyq-bench/NyqBench.cpp
index 101bd6681..5afd20477 100755
--- a/lib-src/mod-nyq-bench/NyqBench.cpp
+++ b/lib-src/mod-nyq-bench/NyqBench.cpp
@@ -170,7 +170,7 @@ extern "C"
          case AppQuiting: {
             wxASSERT(gBench != NULL);
             if (gBench) {
-               delete gBench;
+               gBench->Close(true);
                gBench = NULL;
             }
          }
@@ -270,7 +270,7 @@ void NyqTextCtrl::OnChar(wxKeyEvent & e)
    }
 }
 
-#if defined(__WXMAC__)
+#if defined(__WXMAC__REMOVED_UNTIL_ITS_PROVEN_THAT_IT_IS_STILL_NEEDED)
 #include <wx/mac/uma.h>
 
 // This is hackage to correct a problem on Leopard where the
diff --git a/lib-src/mod-nyq-bench/NyqBench.h b/lib-src/mod-nyq-bench/NyqBench.h
index 003732993..77979bc71 100755
--- a/lib-src/mod-nyq-bench/NyqBench.h
+++ b/lib-src/mod-nyq-bench/NyqBench.h
@@ -53,7 +53,7 @@ class NyqTextCtrl:public wxTextCtrl
    void GoNext();
 
  private:
-#if defined(__WXMAC__)
+#if defined(__WXMAC__REMOVED_UNTIL_ITS_PROVEN_THAT_IT_IS_STILL_NEEDED)
    void OnKeyDown(wxKeyEvent & e);
 #endif
    void OnKeyUp(wxKeyEvent & e);