fixed infinite recursion in SetFocus()

[wxWidgets.git] / include / wx / generic / treectlg.h

diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h
index a6bff0878f1ae89462b282c98840a852177519da..7958708b1e97333921040f70069865d8c333129b 100644 (file)
--- a/include/wx/generic/treectlg.h
+++ b/include/wx/generic/treectlg.h
@@ -16,6 +16,8 @@
     #pragma interface "treectlg.h"
 #endif
 
+#if wxUSE_TREECTRL
+
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/object.h"
@@ -54,7 +56,7 @@ public:
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
 #ifdef __WXMAC__
-               long style = wxTR_MAC_BUTTONS | wxTR_NO_LINES,
+               long style = wxTR_MAC_BUTTONS | wxTR_NO_LINES | wxTR_ROW_LINES,
 #else
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
 #endif
@@ -71,7 +73,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
 #ifdef __WXMAC__
-               long style = wxTR_MAC_BUTTONS | wxTR_NO_LINES,
+               long style = wxTR_MAC_BUTTONS | wxTR_NO_LINES | wxTR_ROW_LINES,
 #else
                long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT,
 #endif
@@ -423,7 +425,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericTreeCtrl)
 };
 
-#if !defined(__WXMSW__) || defined(__WIN16__)
+#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
 /*
  * wxTreeCtrl has to be a real class or we have problems with
  * the run-time information.
@@ -450,5 +452,7 @@ public:
 
 #endif
 
+#endif // wxUSE_TREECTRL
+
 #endif // _GENERIC_TREECTRL_H_