reverted Julian's unintentional breakage of wxChoice

[wxWidgets.git] / include / wx / treectrl.h

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index b30804c1e8f17e3101f294da0265c80d219b85cd..8b5b215034101e6686a5bed2f72b5cc3129479eb 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -7,7 +7,9 @@
 // include the platform-dependent wxTreeCtrl class
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/generic/treectlg.h"
+#elif defined(__WXMSW__)
     #ifdef __WIN16__
         #include "wx/generic/treectlg.h"
     #else
@@ -17,8 +19,6 @@
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/treectlg.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/treectrl.h"
 #elif defined(__WXMAC__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXPM__)
@@ -27,12 +27,12 @@
     #include "wx/generic/treectlg.h"
 #endif
 
+/*
 #if !defined(__WXMSW__)
 #define wxTreeCtrl wxGenericTreeCtrl
 #define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl
 #endif
+*/
 
-#endif
-    // _WX_TREECTRL_H_BASE_
-
+#endif // _WX_TREECTRL_H_BASE_