diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 94fff8add4..2a958abac3 100644
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -25,6 +25,10 @@
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 
+#ifndef __WXMSW__
+    #define wxHAS_GENERIC_TREECTRL
+#endif
+
 // ----------------------------------------------------------------------------
 // wxTreeCtrlBase
 // ----------------------------------------------------------------------------
@@ -456,18 +460,12 @@ private:
 // include the platform-dependent wxTreeCtrl class
 // ----------------------------------------------------------------------------
 
-#if defined(__WXUNIVERSAL__)
+#ifdef wxHAS_GENERIC_TREECTRL
     #include "wx/generic/treectlg.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/treectrl.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/generic/treectlg.h"
-#elif defined(__WXGTK__)
-    #include "wx/generic/treectlg.h"
-#elif defined(__WXMAC__)
-    #include "wx/generic/treectlg.h"
-#elif defined(__WXQT__)
-    #include "wx/generic/treectlg.h"
+#else
+    #error "unknown native wxTreeCtrl implementation"
 #endif
 
 #endif // wxUSE_TREECTRL
diff --git a/tests/controls/treectrltest.cpp b/tests/controls/treectrltest.cpp
index d383016045..e7ce5d97bf 100644
--- a/tests/controls/treectrltest.cpp
+++ b/tests/controls/treectrltest.cpp
@@ -587,7 +587,12 @@ void TreeCtrlTestCase::KeyNavigation()
 
     CPPUNIT_ASSERT(m_tree->IsExpanded(m_root));
 
+#ifdef wxHAS_GENERIC_TREECTRL
     sim.Char('-');
+#else
+    sim.Char(WXK_LEFT);
+#endif
+
     wxYield();
 
     CPPUNIT_ASSERT(!m_tree->IsExpanded(m_root));