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

Fixing commit problem

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-01 15:01:51 +00:00
parent 47e92c4137
commit afff720b28
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/treectrl.cpp
View File

@@ -1725,15 +1725,6 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
if ( htItem && isMultiple ) if ( htItem && isMultiple )
{ {
<<<<<<< treectrl.cpp
int x = GET_X_LPARAM(lParam),
y = GET_Y_LPARAM(lParam);
m_dragImage->Move(wxPoint(x, y));
HTREEITEM htiTarget = GetItemFromPoint(GetHwnd(), x, y);
if ( htiTarget )
=======
if ( wParam & MK_CONTROL ) if ( wParam & MK_CONTROL )
{ {
SetFocus(); SetFocus();
@@ -1787,7 +1778,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
if ( m_dragImage ) if ( m_dragImage )
{ {
m_dragImage->Move(wxPoint(x, y), this); m_dragImage->Move(wxPoint(x, y));
if ( htItem ) if ( htItem )
{ {
// highlight the item as target (hiding drag image is // highlight the item as target (hiding drag image is