From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 15 Oct 1999 16:28:09 +0000 (+0000)
Subject: resolved a conflict
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/52f13e4930add51417d27d2098a2baa76ada1a6c?ds=sidebyside

resolved a conflict


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index b94bb87d8d..44c408406b 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1348,22 +1348,24 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     switch ( hdr->code )
     {
         case NM_RCLICK:
-	{
-	    if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
-		return TRUE;
-	    
-	    TV_HITTESTINFO tvhti;
-	    ::GetCursorPos(&(tvhti.pt));
-	    ::ScreenToClient(GetHwnd(),&(tvhti.pt));
-	    if ((HTREEITEM) TreeView_HitTest(GetHwnd(),&tvhti) != (HTREEITEM) NULL) {
-		if (tvhti.flags & TVHT_ONITEM) {
-		    event.m_item = (WXHTREEITEM) tvhti.hItem;
-		    eventType=wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
-		}
-	    }
-	    break;
-	}
-	
+        {
+            if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
+                return TRUE;
+
+            TV_HITTESTINFO tvhti;
+            ::GetCursorPos(&(tvhti.pt));
+            ::ScreenToClient(GetHwnd(),&(tvhti.pt));
+            if ( TreeView_HitTest(GetHwnd(),&tvhti) )
+            {
+                if( tvhti.flags & TVHT_ONITEM )
+                {
+                    event.m_item = (WXHTREEITEM) tvhti.hItem;
+                    eventType=wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
+                }
+            }
+            break;
+        }
+
         case TVN_BEGINDRAG:
             eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
             // fall through