From 131cfee89d7d63c2fbe191c8879320b252af82b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kon=C3=AD=C4=8Dek?= <martin.konicek@gmail.com>
Date: Sat, 18 Jul 2009 15:23:39 +0000
Subject: [PATCH] - debugger tooltips - changed return type of
 IDebugger.GetTooltipControl to System.Object

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4484 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../Project/Src/Service/WindowsDebugger.cs    | 20 ++++++++++---------
 .../Src/Services/Debugger/DefaultDebugger.cs  |  2 +-
 .../Src/Services/Debugger/IDebugger.cs        |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
index aafe864d4c..1d8cdd8f19 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
@@ -79,8 +79,8 @@ namespace ICSharpCode.SharpDevelop.Services
 		
 		Process debuggedProcess;
 		
-		DynamicTreeDebuggerRow currentTooltipRow;
-		Expression             currentTooltipExpression;
+		//DynamicTreeDebuggerRow currentTooltipRow;
+		//Expression             currentTooltipExpression;
 		
 		public event EventHandler<ProcessEventArgs> ProcessSelected;
 		
@@ -379,7 +379,7 @@ namespace ICSharpCode.SharpDevelop.Services
 		/// Gets the tooltip control that shows the value of given variable.
 		/// Return null if no tooltip is available.
 		/// </summary>
-		public DebuggerGridControl GetTooltipControl(string variableName)
+		public object GetTooltipControl(string variableName)
 		{
 			ValueNode valueNode;
 			try {
@@ -390,13 +390,14 @@ namespace ICSharpCode.SharpDevelop.Services
 				return null;
 			}
 			
-			try {
+			/*try {
 				currentTooltipRow = new DynamicTreeDebuggerRow(DebuggedProcess, valueNode);
 			} catch (AbortedBecauseDebuggeeResumedException) {
 				return null;
-			}
-			currentTooltipExpression = valueNode.Expression;
-			return new DebuggerGridControl(currentTooltipRow);
+			}*/
+			//currentTooltipExpression = valueNode.Expression;
+			//return new DebuggerGridControl(currentTooltipRow);
+			return valueNode.Expression + " = " + valueNode.Text + ", type: " + valueNode.Type;
 		}
 		
 		public bool CanSetInstructionPointer(string filename, int line, int column)
@@ -633,7 +634,8 @@ namespace ICSharpCode.SharpDevelop.Services
 			using(new PrintTimes("Jump to current line")) {
 				JumpToCurrentLine();
 			}
-			if (currentTooltipRow != null && currentTooltipRow.IsShown) {
+			// TODO update tooltip
+			/*if (currentTooltipRow != null && currentTooltipRow.IsShown) {
 				using(new PrintTimes("Update tooltip")) {
 					try {
 						Utils.DoEvents(debuggedProcess);
@@ -642,7 +644,7 @@ namespace ICSharpCode.SharpDevelop.Services
 					} catch (AbortedBecauseDebuggeeResumedException) {
 					}
 				}
-			}
+			}*/
 		}
 		
 		void debuggedProcess_DebuggingResumed(object sender, ProcessEventArgs e)
diff --git a/src/Main/Base/Project/Src/Services/Debugger/DefaultDebugger.cs b/src/Main/Base/Project/Src/Services/Debugger/DefaultDebugger.cs
index 511e080bb5..66f2e451a0 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/DefaultDebugger.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/DefaultDebugger.cs
@@ -130,7 +130,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
 		/// Gets the tooltip control that shows the value of given variable.
 		/// Return null if no tooltip is available.
 		/// </summary>
-		public DebuggerGridControl GetTooltipControl(string variable)
+		public object GetTooltipControl(string variable)
 		{
 			return null;
 		}
diff --git a/src/Main/Base/Project/Src/Services/Debugger/IDebugger.cs b/src/Main/Base/Project/Src/Services/Debugger/IDebugger.cs
index 1c8a99c7c8..8f2ac676c8 100644
--- a/src/Main/Base/Project/Src/Services/Debugger/IDebugger.cs
+++ b/src/Main/Base/Project/Src/Services/Debugger/IDebugger.cs
@@ -77,7 +77,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
 		/// Gets the tooltip control that shows the value of given variable.
 		/// Return null if no tooltip is available.
 		/// </summary>
-		DebuggerGridControl GetTooltipControl(string variable);
+		object GetTooltipControl(string variable);
 		
 		/// <summary>
 		/// Queries the debugger whether it is possible to set the instruction pointer to a given position.