Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index e167d56f6bce4fe14d9604725dd5dcc1f38b9a01..08e0e15973dda987c53ce3e6d4fa8d4708c3f3a9 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -1,13 +1,42 @@
-#ifndef __TREECTRLH_BASE__
-#define __TREECTRLH_BASE__
-
-#if defined(__WINDOWS__)
-#include "wx/msw/treectrl.h"
-#elif defined(__MOTIF__)
-#include "wx/generic/treectrl.h"
-#elif defined(__GTK__)
-#include "wx/generic/treectrl.h"
+#ifndef _WX_TREECTRL_H_BASE_
+#define _WX_TREECTRL_H_BASE_
+
+#include "wx/treebase.h"
+
+// ----------------------------------------------------------------------------
+// include the platform-dependent wxTreeCtrl class
+// ----------------------------------------------------------------------------
+
+#if defined(__WXUNIVERSAL__)
+    #include "wx/generic/treectlg.h"
+#elif defined(__WXMSW__)
+    #ifdef __WIN16__
+        #include "wx/generic/treectlg.h"
+    #else
+        #include "wx/msw/treectrl.h"
+    #endif
+#elif defined(__WXMOTIF__)
+    #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__)
+    #include "wx/generic/treectlg.h"
+#elif defined(__WXSTUBS__)
+    #include "wx/generic/treectlg.h"

 #endif
 
 #endif
 

+/*
+#if !defined(__WXMSW__)
+#define wxTreeCtrl wxGenericTreeCtrl
+#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl

 #endif
 #endif

-    // __TREECTRLH_BASE__
+*/
+
+#endif
+    // _WX_TREECTRL_H_BASE_
+
+