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

fix crash when the user code refuses to validate the new text when editing the item and a generic label editing code cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-07-08 16:38:46 +00:00
parent 9602d7ae69
commit edb8f2985f
2 changed files with 129 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/generic/treectlg.h
View File

@@ -353,8 +353,7 @@ protected:
wxGenericTreeItem *m_anchor;
wxGenericTreeItem *m_current,
*m_key_current,
*m_currentEdit;
*m_key_current;
unsigned short m_indent;
unsigned short m_spacing;
int m_lineHeight;
@@ -367,7 +366,6 @@ protected:
m_ownsImageListState,
m_ownsImageListButtons;
bool m_isDragging; // true between BEGIN/END drag events
bool m_renameAccept;
bool m_lastOnSame; // last click on the same item as prev
wxImageList *m_imageListNormal,
*m_imageListState,
@@ -380,7 +378,6 @@ protected:
wxGenericTreeItem *m_oldSelection;
wxTimer *m_renameTimer;
wxString m_renameRes;
wxBitmap *m_arrowRight,
*m_arrowDown;
@@ -431,7 +428,7 @@ protected:
void RefreshSelectedUnder(wxGenericTreeItem *item);
void OnRenameTimer();
void OnRenameAccept();
bool OnRenameAccept(wxGenericTreeItem *item, const wxString& value);
void FillArray(wxGenericTreeItem*, wxArrayTreeItemIds&) const;
void SelectItemRange( wxGenericTreeItem *item1, wxGenericTreeItem *item2 );