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

fix for clicking on the button from 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-04-02 12:23:54 +00:00
parent f07bb01b18
commit 42191a1dbf
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/generic/treectlg.cpp
View File

@@ -2282,13 +2282,26 @@ void wxGenericTreeCtrl::Edit( const wxTreeItemId& item )
m_imageListNormal->GetSize( image, image_w, image_h ); m_imageListNormal->GetSize( image, image_w, image_h );
image_w += 4; image_w += 4;
} }
else else // !RightDown() && !LeftUp() ==> LeftDown() || LeftDClick()
{ {
wxFAIL_MSG(_T("you must create an image list to use images!")); wxFAIL_MSG(_T("you must create an image list to use images!"));
} }
} }
x += image_w; x += image_w;
w -= image_w + 4; // I don't know why +4 is needed 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); wxClientDC dc(this);
PrepareDC( dc ); PrepareDC( dc );
@@ -2489,13 +2502,6 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
event.ControlDown(), event.ControlDown(),
is_multiple, extended_select, unselect_others); is_multiple, extended_select, unselect_others);
if ( (flags & wxTREE_HITTEST_ONITEMBUTTON) && event.LeftDown() )
{
Toggle( item );
if ( is_multiple )
return;
}
SelectItem(item, unselect_others, extended_select); SelectItem(item, unselect_others, extended_select);
if ( event.LeftDClick() ) if ( event.LeftDClick() )