corrected conditional compilation tests

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

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 0fce45a8a2ee0dfc6e8f5ec582d2681e6a56ed13..08e0e15973dda987c53ce3e6d4fa8d4708c3f3a9 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -1,19 +1,42 @@
 #ifndef _WX_TREECTRL_H_BASE_
 #define _WX_TREECTRL_H_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__)
 #elif defined(__WXMOTIF__)

-#include "wx/generic/treectrl.h"
+    #include "wx/generic/treectlg.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/generic/treectrl.h"
+    #include "wx/generic/treectlg.h"

 #elif defined(__WXQT__)
 #elif defined(__WXQT__)

-#include "wx/qt/treectrl.h"
+    #include "wx/qt/treectrl.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/generic/treectrl.h"
+    #include "wx/generic/treectlg.h"
+#elif defined(__WXPM__)
+    #include "wx/generic/treectlg.h"

 #elif defined(__WXSTUBS__)
 #elif defined(__WXSTUBS__)

-#include "wx/generic/treectrl.h"
+    #include "wx/generic/treectlg.h"
+#endif
+
+/*
+#if !defined(__WXMSW__)
+#define wxTreeCtrl wxGenericTreeCtrl
+#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl

 #endif
 #endif

+*/

 
 #endif
     // _WX_TREECTRL_H_BASE_
 
 #endif
     // _WX_TREECTRL_H_BASE_

+
+