Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows compilation fixes after wxTreeCtrl refactoring

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-10-10 20:36:20 +00:00
parent 8cee4a304f
commit 642446e3bf
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/treectlg.cpp
View File

@@ -2962,7 +2962,7 @@ void wxGenericTreeCtrl::OnRenameCancelled(wxGenericTreeItem *item)
void wxGenericTreeCtrl::OnRenameTimer() void wxGenericTreeCtrl::OnRenameTimer()
{ {
Edit( m_current ); EditLabel( m_current );
} }
void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event ) void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )

20
src/msw/treectrl.cpp
View File

@@ -42,7 +42,7 @@
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/imaglist.h" #include "wx/imaglist.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/msw/treectrl.h" #include "wx/treectrl.h"
#include "wx/msw/dragimag.h" #include "wx/msw/dragimag.h"
// macros to hide the cast ugliness // macros to hide the cast ugliness
@@ -1693,7 +1693,7 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
wxImageList *wxTreeCtrl::GetImageList(int) const wxImageList *wxTreeCtrl::GetImageList(int) const
{ {
return GetImageList(); return wxTreeCtrlBase::GetImageList();
} }
void wxTreeCtrl::SetImageList(wxImageList *imageList, int) void wxTreeCtrl::SetImageList(wxImageList *imageList, int)
@@ -1955,16 +1955,6 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
} }
} }
void wxTreeCtrl::UnselectItem(const wxTreeItemId& item)
{
SelectItem(item, false);
}
void wxTreeCtrl::ToggleItemSelection(const wxTreeItemId& item)
{
SelectItem(item, !IsSelected(item));
}
void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item) void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
{ {
// no error return // no error return
@@ -2131,12 +2121,6 @@ int CALLBACK wxTreeSortHelper::Compare(LPARAM pItem1,
GetIdFromData(tree, pItem2)); GetIdFromData(tree, pItem2));
} }
int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
const wxTreeItemId& item2)
{
return wxStrcmp(GetItemText(item1), GetItemText(item2));
}
void wxTreeCtrl::SortChildren(const wxTreeItemId& item) void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
{ {
wxCHECK_RET( item.IsOk(), wxT("invalid tree item") ); wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );