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

don't start label editing when double clicking the item

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-06-20 12:45:33 +00:00
parent 43bc2aae58
commit f7585687b2
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/generic/treectrl.cpp
View File

@@ -611,6 +611,7 @@ void wxTreeCtrl::Init()
m_oldSelection = (wxGenericTreeItem *)NULL; m_oldSelection = (wxGenericTreeItem *)NULL;
m_renameTimer = new wxTreeRenameTimer( this ); m_renameTimer = new wxTreeRenameTimer( this );
m_lastOnSame = FALSE;
m_normalFont = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ); m_normalFont = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT );
m_boldFont = wxFont( m_normalFont.GetPointSize(), m_boldFont = wxFont( m_normalFont.GetPointSize(),
@@ -2172,7 +2173,8 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
// we process left mouse up event (enables in-place edit), right down // we process left mouse up event (enables in-place edit), right down
// (pass to the user code), left dbl click (activate item) and // (pass to the user code), left dbl click (activate item) and
// dragging/moving events for items drag-and-drop // dragging/moving events for items drag-and-drop
if ( !(event.LeftUp() || if ( !(event.LeftDown() ||
event.LeftUp() ||
event.RightDown() || event.RightDown() ||
event.LeftDClick() || event.LeftDClick() ||
event.Dragging() || event.Dragging() ||
@@ -2303,14 +2305,24 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
nevent.SetEventObject(this); nevent.SetEventObject(this);
GetEventHandler()->ProcessEvent(nevent); GetEventHandler()->ProcessEvent(nevent);
} }
else if ( event.LeftUp() && (item == m_current) && else if ( event.LeftUp() && m_lastOnSame )
{
if ( (item == m_current) &&
(flags & wxTREE_HITTEST_ONITEMLABEL) && (flags & wxTREE_HITTEST_ONITEMLABEL) &&
HasFlag(wxTR_EDIT_LABELS) ) HasFlag(wxTR_EDIT_LABELS) )
{ {
m_renameTimer->Start( 100, TRUE ); m_renameTimer->Start( 100, TRUE );
}
m_lastOnSame = FALSE;
} }
else else
{ {
if ( event.LeftDown() )
{
m_lastOnSame = item == m_current;
}
// how should the selection work for this event? // how should the selection work for this event?
bool is_multiple, extended_select, unselect_others; bool is_multiple, extended_select, unselect_others;
EventFlagsToSelType(GetWindowStyleFlag(), EventFlagsToSelType(GetWindowStyleFlag(),
@@ -2329,6 +2341,10 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
if ( event.LeftDClick() ) if ( event.LeftDClick() )
{ {
// double clicking should not start editing the item label
m_renameTimer->Stop();
m_lastOnSame = FALSE;
wxTreeEvent nevent( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() ); wxTreeEvent nevent( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
nevent.m_item = item; nevent.m_item = item;
nevent.m_code = 0; nevent.m_code = 0;