Fixes so joystick not only compiles on Linux, but it actually works too!

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

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index fe92ae504cad43cfe6c92ebfaedb602c3e48c770..080de6b24dc80950e80f08c1bca07be3cc434f37 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -10,11 +10,7 @@
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXMSW__)
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXMSW__)

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

         #include "wx/msw/treectrl.h"
         #include "wx/msw/treectrl.h"

-    #endif

 #elif defined(__WXMOTIF__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)
 #elif defined(__WXMOTIF__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)


@@ -24,13 +20,12 @@
 #elif defined(__WXCOCOA__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXPM__)

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

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

-#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl

 #endif
 */
 
 #endif
 */