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
This commit is contained in:
@@ -112,7 +112,7 @@ class WXDLLEXPORT wxTreeRenameTimer: public wxTimer
|
|||||||
public:
|
public:
|
||||||
// start editing the current item after half a second (if the mouse hasn't
|
// start editing the current item after half a second (if the mouse hasn't
|
||||||
// been clicked/moved)
|
// been clicked/moved)
|
||||||
static const int DELAY = 500;
|
enum { DELAY = 500 };
|
||||||
|
|
||||||
wxTreeRenameTimer( wxGenericTreeCtrl *owner );
|
wxTreeRenameTimer( wxGenericTreeCtrl *owner );
|
||||||
|
|
||||||
@@ -158,7 +158,7 @@ class WXDLLEXPORT wxTreeFindTimer : public wxTimer
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// reset the current prefix after half a second of inactivity
|
// reset the current prefix after half a second of inactivity
|
||||||
static const int DELAY = 500;
|
enum { DELAY = 500 };
|
||||||
|
|
||||||
wxTreeFindTimer( wxGenericTreeCtrl *owner ) { m_owner = owner; }
|
wxTreeFindTimer( wxGenericTreeCtrl *owner ) { m_owner = owner; }
|
||||||
|
|
||||||
@@ -1406,7 +1406,7 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId)
|
|||||||
wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
|
wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
|
||||||
|
|
||||||
wxCHECK_RET( item, _T("invalid item in wxGenericTreeCtrl::Expand") );
|
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") );
|
_T("can't expand hidden root") );
|
||||||
|
|
||||||
if ( !item->HasPlus() )
|
if ( !item->HasPlus() )
|
||||||
@@ -1452,7 +1452,7 @@ void wxGenericTreeCtrl::ExpandAll(const wxTreeItemId& item)
|
|||||||
|
|
||||||
void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
|
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") );
|
_T("can't collapse hidden root") );
|
||||||
|
|
||||||
wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
|
wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
|
||||||
|
Reference in New Issue
Block a user