AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied patch [ 1212208 ] Fix a bug in wxTreeCtrl with wxTR_MULTIPLE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2005-06-16 17:01:19 +00:00
parent 8af56e0827
commit e3ad57026a
2 changed files with 64 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/treectrl.h
View File

@ -498,7 +498,8 @@ private:
void* m_pVirtualRoot;
// the starting item for selection with Shift
wxTreeItemId m_htSelStart;
wxTreeItemId m_htSelStart, m_htClickedItem;
wxPoint m_ptClick;
friend class wxTreeItemIndirectData;
friend class wxTreeSortHelper;

69
src/msw/treectrl.cpp
View File

@ -2289,6 +2289,12 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
int x = GET_X_LPARAM(lParam),
y = GET_Y_LPARAM(lParam);
HTREEITEM htItem = GetItemFromPoint(GetHwnd(), x, y);
TV_HITTESTINFO tvht;
tvht.pt.x = x;
tvht.pt.y = y;
TreeView_HitTest(GetHwnd(), &tvht);
switch ( nMsg )
{
@ -2309,8 +2315,11 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
#if !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
case WM_LBUTTONDOWN:
if ( htItem && isMultiple )
if ( htItem && isMultiple && (tvht.flags & TVHT_ONITEM) != 0 )
{
m_htClickedItem = (WXHTREEITEM) htItem;
m_ptClick = wxPoint(x, y);
if ( wParam & MK_CONTROL )
{
SetFocus();
@ -2336,8 +2345,11 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
m_htSelStart = TreeView_GetSelection(GetHwnd());
}
SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,
if ( m_htSelStart )
SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,
!(wParam & MK_CONTROL));
else
::SelectItem(GetHwnd(), htItem);
::SetFocus(GetHwnd(), htItem);
@ -2347,6 +2359,8 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
{
// avoid doing anything if we click on the only
// currently selected item
SetFocus();
wxArrayTreeItemIds selections;
size_t count = GetSelections(selections);
@ -2359,11 +2373,7 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
// otherwise, perform the deselection on mouse-up.
// this allows multiple drag and drop to work.
if (IsItemSelected(GetHwnd(), htItem))
{
::SetFocus(GetHwnd(), htItem);
}
else
if (!IsItemSelected(GetHwnd(), htItem))
{
UnselectAll();
@ -2375,6 +2385,8 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
TreeView_SelectItem(GetHwnd(), 0);
::SelectItem(GetHwnd(), htItem);
}
::SetFocus(GetHwnd(), htItem);
processed = true;
}
// reset on any click without Shift
@ -2385,6 +2397,46 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
#endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
case WM_MOUSEMOVE:
if ( m_htClickedItem )
{
int cx = abs(m_ptClick.x - x);
int cy = abs(m_ptClick.y - y);
if ( cx > GetSystemMetrics( SM_CXDRAG ) || cy > GetSystemMetrics( SM_CYDRAG ) )
{
HWND pWnd = ::GetParent( GetHwnd() );
if ( pWnd )
{
NM_TREEVIEW tv;
tv.hdr.hwndFrom = GetHwnd();
tv.hdr.idFrom = ::GetWindowLong( GetHwnd(), GWL_ID );
tv.hdr.code = TVN_BEGINDRAG;
tv.itemNew.hItem = HITEM(m_htClickedItem);
TVITEM tviAux;
ZeroMemory(&tviAux, sizeof(tviAux));
tviAux.hItem = HITEM(m_htClickedItem);
tviAux.mask = TVIF_STATE | TVIF_PARAM;
tviAux.stateMask = 0xffffffff;
TreeView_GetItem( GetHwnd(), &tviAux );
tv.itemNew.state = tviAux.state;
tv.itemNew.lParam = tviAux.lParam;
tv.ptDrag.x = x;
tv.ptDrag.y = y;
::SendMessage( pWnd, WM_NOTIFY, tv.hdr.idFrom, (LPARAM)&tv );
}
m_htClickedItem.Unset();
}
}
if ( m_dragImage )
{
m_dragImage->Move(wxPoint(x, y));
@ -2413,7 +2465,10 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
{
UnselectAll();
TreeView_SelectItem(GetHwnd(), htItem);
::SelectItem(GetHwnd(), htItem);
::SetFocus(GetHwnd(), htItem);
}
m_htClickedItem.Unset();
}
// fall through