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 1a2cc60c1c4651c70a1288122a90ad31ae89092f..5f2c44557a765d63287cc6ff2031abdc8204c367 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -7,7 +7,9 @@
 // include the platform-dependent wxTreeCtrl class
 // ----------------------------------------------------------------------------
 
 // include the platform-dependent wxTreeCtrl class
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/generic/treectlg.h"
+#elif defined(__WXMSW__)

     #ifdef __WIN16__
         #include "wx/generic/treectlg.h"
     #else
     #ifdef __WIN16__
         #include "wx/generic/treectlg.h"
     #else


@@ -17,24 +19,19 @@
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/treectlg.h"
     #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(__WXMAC__)
     #include "wx/generic/treectlg.h"

-#elif defined(__WXPM__)
+#elif defined(__WXCOCOA__)

     #include "wx/generic/treectlg.h"
     #include "wx/generic/treectlg.h"

-#elif defined(__WXSTUBS__)
+#elif defined(__WXPM__)

     #include "wx/generic/treectlg.h"
 #endif
 
 /*
 #if !defined(__WXMSW__)
 #define wxTreeCtrl wxGenericTreeCtrl
     #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_