fixed wxImage->wxBitmap conversion for images with alpha channel

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

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 8d6928b669a46fde9046bee44a62f5a556de35c6..080de6b24dc80950e80f08c1bca07be3cc434f37 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -1,19 +1,33 @@
 #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__)
+        #include "wx/msw/treectrl.h"

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

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

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

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

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

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

 #endif
 
 #endif
 

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

 #endif
 #endif

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