From 6359fa0e03f9954d6ee5d52bbc6d663ccffda9fc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 2 Apr 2001 12:29:24 +0000 Subject: [PATCH] argh! patch misapplied the patch in another place as well, fixing this git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/treectlg.cpp | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 0984a23ed2..c7155ed9a2 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -2282,34 +2282,26 @@ void wxGenericTreeCtrl::Edit( const wxTreeItemId& item ) m_imageListNormal->GetSize( image, image_w, image_h ); image_w += 4; } - else // !RightDown() && !LeftUp() ==> LeftDown() || LeftDClick() + else { wxFAIL_MSG(_T("you must create an image list to use images!")); } } x += image_w; w -= image_w + 4; // I don't know why +4 is needed - if ( flags & wxTREE_HITTEST_ONITEMBUTTON ) - { - // only toggle the item for a single click, double click on - // the button doesn't do anything (it toggles the item twice) - if ( event.LeftDown() ) - { - Toggle( item ); - } - - // don't select the item if the button was clicked - return; - } - wxClientDC dc(this); PrepareDC( dc ); x = dc.LogicalToDeviceX( x ); y = dc.LogicalToDeviceY( y ); - wxTreeTextCtrl *text = new wxTreeTextCtrl( - this, -1, &m_renameAccept, &m_renameRes, this, s, wxPoint(x-4,y-4), wxSize(w+11,h+8) ); + wxTreeTextCtrl *text = new wxTreeTextCtrl(this, -1, + &m_renameAccept, + &m_renameRes, + this, + s, + wxPoint(x-4,y-4), + wxSize(w+11,h+8)); text->SetFocus(); } -- 2.45.2