And a 'standard colours' bitmap to help fix wxToolBar colour mapping problem

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

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 10afdbcd4240894c82cb8fada227f7c20a4fc5b6..1a2cc60c1c4651c70a1288122a90ad31ae89092f 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -1,15 +1,40 @@
-#ifndef __TREECTRLH_BASE__
-#define __TREECTRLH_BASE__
+#ifndef _WX_TREECTRL_H_BASE_
+#define _WX_TREECTRL_H_BASE_
+
+#include "wx/treebase.h"
+
+// ----------------------------------------------------------------------------
+// include the platform-dependent wxTreeCtrl class
+// ----------------------------------------------------------------------------

 
 #if defined(__WXMSW__)
 
 #if defined(__WXMSW__)

-#include "wx/msw/treectrl.h"
+    #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/generic/treectrl.h"
+    #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
+
+/*
+#if !defined(__WXMSW__)
+#define wxTreeCtrl wxGenericTreeCtrl
+#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl

 #endif
 #endif

+*/

 
 #endif
 
 #endif

-    // __TREECTRLH_BASE__
+    // _WX_TREECTRL_H_BASE_
+
+