[commit] r2651 - trunk/GME/GMEActiveBrowser

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Oct  3 14:02:51 2016
New Revision: 2651

Log:
TreeBrowser: fix shift-click select after deleting

Modified:
   trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj
   trunk/GME/GMEActiveBrowser/MgaMappedTreeCtrl.h
   trunk/GME/GMEActiveBrowser/TreeCtrlEx.cpp
   trunk/GME/GMEActiveBrowser/TreeCtrlEx.h

Modified: trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj
==============================================================================
--- trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj	Thu Sep 15 10:03:36 2016	(r2650)
+++ trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj	Mon Oct  3 14:02:51 2016	(r2651)
@@ -102,7 +102,7 @@
       </HeaderFileName>
     </Midl>
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

Modified: trunk/GME/GMEActiveBrowser/MgaMappedTreeCtrl.h
==============================================================================
--- trunk/GME/GMEActiveBrowser/MgaMappedTreeCtrl.h	Thu Sep 15 10:03:36 2016	(r2650)
+++ trunk/GME/GMEActiveBrowser/MgaMappedTreeCtrl.h	Mon Oct  3 14:02:51 2016	(r2651)
@@ -64,7 +64,7 @@
 
 	virtual BOOL DeleteItem(HTREEITEM hItem) {
 		m_MgaMap.RemoveTreeItem(hItem);
-		return CTreeCtrl::DeleteItem(hItem);
+		return CTreeCtrlEx::DeleteItem(hItem);
 	}
 
 	virtual void CleanUp() {

Modified: trunk/GME/GMEActiveBrowser/TreeCtrlEx.cpp
==============================================================================
--- trunk/GME/GMEActiveBrowser/TreeCtrlEx.cpp	Thu Sep 15 10:03:36 2016	(r2650)
+++ trunk/GME/GMEActiveBrowser/TreeCtrlEx.cpp	Mon Oct  3 14:02:51 2016	(r2651)
@@ -1220,3 +1220,11 @@
 	}
 			 
 }
+
+BOOL CTreeCtrlEx::DeleteItem(HTREEITEM hItem) {
+	auto ret = CTreeCtrl::DeleteItem(hItem);
+
+	m_hFirstSelectedItem = GetSelectedItem();
+
+	return ret;
+}

Modified: trunk/GME/GMEActiveBrowser/TreeCtrlEx.h
==============================================================================
--- trunk/GME/GMEActiveBrowser/TreeCtrlEx.h	Thu Sep 15 10:03:36 2016	(r2650)
+++ trunk/GME/GMEActiveBrowser/TreeCtrlEx.h	Mon Oct  3 14:02:51 2016	(r2651)
@@ -51,7 +51,7 @@
 	int FindTextInItems(CString &strText, HTREEITEM hStartAtItem,
 					CStringArrayEx &strResults, CArray<HTREEITEM,HTREEITEM>& hResults);
 	BOOL CreateDragImageEx(CPoint ptDragPoint);
-	//////////////////////////////////
+	BOOL CTreeCtrlEx::DeleteItem(HTREEITEM hItem);
 
 protected:
 	void SelectMultiple( HTREEITEM hClickedItem, UINT nFlags, CPoint point );