From 7a944d2fd2324ca7886d36fd3f4d7a174afdff3a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 4 Jun 2002 20:17:44 +0000 Subject: [PATCH] Fixed a strange MSVC compile error (C2253) It thought a pure virtual function was being defined... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/treectlg.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 11b04eb171..f395d79fca 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -112,7 +112,7 @@ class WXDLLEXPORT wxTreeRenameTimer: public wxTimer public: // start editing the current item after half a second (if the mouse hasn't // been clicked/moved) - static const int DELAY = 500; + enum { DELAY = 500 }; wxTreeRenameTimer( wxGenericTreeCtrl *owner ); @@ -158,7 +158,7 @@ class WXDLLEXPORT wxTreeFindTimer : public wxTimer { public: // reset the current prefix after half a second of inactivity - static const int DELAY = 500; + enum { DELAY = 500 }; wxTreeFindTimer( wxGenericTreeCtrl *owner ) { m_owner = owner; } @@ -1406,7 +1406,7 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId) wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem; wxCHECK_RET( item, _T("invalid item in wxGenericTreeCtrl::Expand") ); - wxCHECK_RET( !HasFlag(wxTR_HIDE_ROOT) || itemId != GetRootItem(), + wxCHECK_RET( !HasFlag(wxTR_HIDE_ROOT) || itemId != GetRootItem(), _T("can't expand hidden root") ); if ( !item->HasPlus() ) @@ -1452,7 +1452,7 @@ void wxGenericTreeCtrl::ExpandAll(const wxTreeItemId& item) void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId) { - wxCHECK_RET( !HasFlag(wxTR_HIDE_ROOT) || itemId != GetRootItem(), + wxCHECK_RET( !HasFlag(wxTR_HIDE_ROOT) || itemId != GetRootItem(), _T("can't collapse hidden root") ); wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem; -- 2.45.2