From a87599b127f6481d0f9bda3a020387724e1fe20c Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sun, 1 Oct 2017 09:44:53 -0700
Subject: [PATCH] Fix building tests with wxUSE_UIACTIONSIMULATOR==0

---
 tests/controls/bitmapcomboboxtest.cpp | 4 ++--
 tests/controls/itemcontainertest.h    | 2 ++
 tests/events/propagation.cpp          | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/controls/bitmapcomboboxtest.cpp b/tests/controls/bitmapcomboboxtest.cpp
index 5b416d51fa..55c044465f 100644
--- a/tests/controls/bitmapcomboboxtest.cpp
+++ b/tests/controls/bitmapcomboboxtest.cpp
@@ -59,8 +59,8 @@ private:
 
     void Bitmap();
 
-#ifdef __WXGTK__
-    virtual void SimSelect()
+#if defined(__WXGTK__) && wxUSE_UIACTIONSIMULATOR
+    virtual void SimSelect() wxOVERRIDE
     {
         // There is an inexplicable and locally irreproducible failure in this
         // test for wxBitmapComboBox when it runs on the Linux buildbot slaves:
diff --git a/tests/controls/itemcontainertest.h b/tests/controls/itemcontainertest.h
index 32853f2c86..981b6f98cf 100644
--- a/tests/controls/itemcontainertest.h
+++ b/tests/controls/itemcontainertest.h
@@ -52,7 +52,9 @@ protected:
     void Set();
     void SetSelection();
     void SetString();
+#if wxUSE_UIACTIONSIMULATOR
     virtual void SimSelect();
+#endif
 
 private:
     wxDECLARE_NO_COPY_CLASS(ItemContainerTestCase);
diff --git a/tests/events/propagation.cpp b/tests/events/propagation.cpp
index 36cf3569f1..bb84cdfb25 100644
--- a/tests/events/propagation.cpp
+++ b/tests/events/propagation.cpp
@@ -248,7 +248,7 @@ private:
 #endif
         CPPUNIT_TEST( DocView );
         WXUISIM_TEST( ContextMenuEvent );
-        CPPUNIT_TEST( PropagationLevel );
+        WXUISIM_TEST( PropagationLevel );
     CPPUNIT_TEST_SUITE_END();
 
     void OneHandler();
@@ -260,8 +260,10 @@ private:
     void ScrollWindowWithHandler();
     void MenuEvent();
     void DocView();
+#if wxUSE_UIACTIONSIMULATOR
     void ContextMenuEvent();
     void PropagationLevel();
+#endif
 
     wxDECLARE_NO_COPY_CLASS(EventPropagationTestCase);
 };