X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d75caaa6d36bd82abf1d7130551635d711fe586..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/generic/treectlg.h?ds=sidebyside diff --git a/include/wx/generic/treectlg.h b/include/wx/generic/treectlg.h index afa132456d..e4e7ecbceb 100644 --- a/include/wx/generic/treectlg.h +++ b/include/wx/generic/treectlg.h @@ -12,7 +12,7 @@ #ifndef _GENERIC_TREECTRL_H_ #define _GENERIC_TREECTRL_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "treectlg.h" #endif @@ -417,9 +417,6 @@ protected: wxTimer *m_renameTimer; - wxBitmap *m_arrowRight, - *m_arrowDown; - // incremental search data wxString m_findPrefix; wxTimer *m_findTimer; @@ -446,9 +443,7 @@ protected: // find the first item starting with the given prefix after the given item wxTreeItemId FindItem(const wxTreeItemId& id, const wxString& prefix) const; - bool HasButtons(void) const - { return (m_imageListButtons != NULL) - || HasFlag(wxTR_TWIST_BUTTONS|wxTR_HAS_BUTTONS); } + bool HasButtons() const { return HasFlag(wxTR_HAS_BUTTONS); } void CalculateLineHeight(); int GetLineHeight(wxGenericTreeItem *item) const;