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 b94bb87d8d00f27e4f9f5dc1385334b9e8b845b4..44c408406b6d03bb6d221ec415a45200bce43ba4 100644 (file)
--- 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