Revert "Never show tree lines when there are tree buttons under OS X and GTK+"

This reverts commit ec2f175241 because it
doesn't seem useful to forcefully turn off the connecting lines when
wxTR_HAS_BUTTONS is specified: they will still be off by default in
wxGTK and wxMac because wxTR_NO_LINES is part of wxTR_DEFAULT_STYLE, but
will be shown now (as they used to be back in 2.6 days) if a style
excluding wxTR_NO_LINES is explicitly specified.

Closes #11522.
This commit is contained in:
Vadim Zeitlin 2019-10-10 13:53:34 +02:00
parent dc99faa096
commit fabf8d1e8a

View File

@ -988,16 +988,6 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
const wxValidator& validator,
const wxString& name )
{
#ifdef __WXMAC__
if (style & wxTR_HAS_BUTTONS)
style |= wxTR_NO_LINES;
#endif // __WXMAC__
#ifdef __WXGTK20__
if (style & wxTR_HAS_BUTTONS)
style |= wxTR_NO_LINES;
#endif
if ( !wxControl::Create( parent, id, pos, size,
style|wxHSCROLL|wxVSCROLL|wxWANTS_CHARS,
validator,