Layout fixes due to measuring with the wrong font. Also added

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

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index b30804c1e8f17e3101f294da0265c80d219b85cd..080de6b24dc80950e80f08c1bca07be3cc434f37 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -7,32 +7,27 @@
 // include the platform-dependent wxTreeCtrl class
 // ----------------------------------------------------------------------------
 
 // include the platform-dependent wxTreeCtrl class
 // ----------------------------------------------------------------------------
 

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

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

-    #endif

 #elif defined(__WXMOTIF__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/treectlg.h"
 #elif defined(__WXMOTIF__)
     #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
 
     #include "wx/generic/treectlg.h"
 #endif
 

+/*

 #if !defined(__WXMSW__)
 #define wxTreeCtrl wxGenericTreeCtrl
 #if !defined(__WXMSW__)
 #define wxTreeCtrl wxGenericTreeCtrl

-#define sm_classwxTreeCtrl sm_classwxGenericTreeCtrl
-#endif
-

 #endif
 #endif

-    // _WX_TREECTRL_H_BASE_
+*/

 
 

+#endif // _WX_TREECTRL_H_BASE_