From afff720b28d92364a9d88e214deddf831a60c1c2 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 1 Mar 2000 15:01:51 +0000
Subject: [PATCH] Fixing commit problem

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/treectrl.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index c0eb3fd506..63f54e57d3 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1725,15 +1725,6 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             case WM_LBUTTONDOWN:
                 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 )
                     {
                         SetFocus();
@@ -1787,7 +1778,7 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             case WM_MOUSEMOVE:
                 if ( m_dragImage )
                 {
-                    m_dragImage->Move(wxPoint(x, y), this);
+                    m_dragImage->Move(wxPoint(x, y));
                     if ( htItem )
                     {
                         // highlight the item as target (hiding drag image is
-- 
2.47.2