X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b77d96500ac802c84e0416e715c907e34d335632..5adad46628e545a6d4172ecf3a0cb848934f5cd0:/src/generic/treectlg.cpp?ds=sidebyside diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index fe255add4c..113dbba584 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -25,9 +25,11 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_TREECTRL + #include "wx/generic/treectlg.h" #include "wx/imaglist.h" #include "wx/settings.h" @@ -663,9 +665,7 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent, wxWindowID id, SetValidator( validator ); #endif -#ifndef __WXMAC__ SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) ); -#endif // m_dottedPen = wxPen( "grey", 0, wxDOT ); too slow under XFree86 m_dottedPen = wxPen( "grey", 0, 0 ); @@ -1584,7 +1584,7 @@ void wxGenericTreeCtrl::ScrollTo(const wxTreeItemId &item) int start_x = 0; int start_y = 0; - ViewStart( &start_x, &start_y ); + GetViewStart( &start_x, &start_y ); start_y *= PIXELS_PER_UNIT; int client_h = 0; @@ -1841,7 +1841,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level int exposed_x = dc.LogicalToDeviceX( 0 ); int exposed_y = dc.LogicalToDeviceY( item->GetY() ); - bool drawLines = (HasFlag(wxTR_NO_LINES) && !HasFlag(wxTR_MAC_BUTTONS)); + bool drawLines = (!HasFlag(wxTR_NO_LINES) && !HasFlag(wxTR_MAC_BUTTONS)); if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item) )) // 10000 = very much { @@ -2743,3 +2743,4 @@ void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item ) Refresh( TRUE, &rect ); } +#endif // wxUSE_TREECTRL