Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

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

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index bb4644ccff790c7518cbffa404a511615bbede2d..5f2c44557a765d63287cc6ff2031abdc8204c367 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -1,13 +1,37 @@
-#ifndef __TREECTRLH_BASE__
-#define __TREECTRLH_BASE__
+#ifndef _WX_TREECTRL_H_BASE_
+#define _WX_TREECTRL_H_BASE_
 
-#if defined(__WXMSW__)
-#include "wx/msw/treectrl.h"
+#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/treectrl.h"
+    #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)
-#include "wx/generic/treectrl.h"
+    #include "wx/generic/treectlg.h"
+#elif defined(__WXMAC__)
+    #include "wx/generic/treectlg.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/generic/treectlg.h"
+#elif defined(__WXPM__)
+    #include "wx/generic/treectlg.h"
 #endif
 
+/*
+#if !defined(__WXMSW__)
+#define wxTreeCtrl wxGenericTreeCtrl
 #endif
-    // __TREECTRLH_BASE__
+*/
+
+#endif // _WX_TREECTRL_H_BASE_
+