Fixed SD2-936: Insight window filename incorrect after renaming file

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2150 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/DisplayBindings/XmlEditor/Project/Src/CodeCompletionWindow.cs

@@ -44,7 +44,7 @@ namespace ICSharpCode.XmlEditor
 			return codeCompletionWindow;
 		}
 		
-		CodeCompletionWindow(ICompletionDataProvider completionDataProvider, Form parentForm, TextEditorControl control, string fileName, bool showDeclarationWindow) : base(parentForm, control, fileName)
+		CodeCompletionWindow(ICompletionDataProvider completionDataProvider, Form parentForm, TextEditorControl control, string fileName, bool showDeclarationWindow) : base(parentForm, control)
 		{
 			this.showDeclarationWindow = showDeclarationWindow;
 		

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/CompletionWindow/AbstractCompletionWindow.cs

@@ -17,18 +17,16 @@ namespace ICSharpCode.TextEditor.Gui.CompletionWindow
 	public abstract class AbstractCompletionWindow : System.Windows.Forms.Form
 	{
 		protected TextEditorControl control;
-		protected string            fileName;
 		protected Size              drawingSize;
 		Rectangle workingScreen;
 		Form parentForm;
 		
-		protected AbstractCompletionWindow(Form parentForm, TextEditorControl control, string fileName)
+		protected AbstractCompletionWindow(Form parentForm, TextEditorControl control)
 		{
 			workingScreen = Screen.GetWorkingArea(parentForm);
 //			SetStyle(ControlStyles.Selectable, false);
 			this.parentForm = parentForm;
 			this.control  = control;
-			this.fileName = fileName;
 			
 			SetLocation();
 			StartPosition   = FormStartPosition.Manual;

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/CompletionWindow/CodeCompletionWindow.cs

@@ -31,12 +31,12 @@ namespace ICSharpCode.TextEditor.Gui.CompletionWindow
 			if (completionData == null || completionData.Length == 0) {
 				return null;
 			}
-			CodeCompletionWindow codeCompletionWindow = new CodeCompletionWindow(completionDataProvider, completionData, parent, control, fileName);
+			CodeCompletionWindow codeCompletionWindow = new CodeCompletionWindow(completionDataProvider, completionData, parent, control);
 			codeCompletionWindow.ShowCompletionWindow();
 			return codeCompletionWindow;
 		}
 		
-		CodeCompletionWindow(ICompletionDataProvider completionDataProvider, ICompletionData[] completionData, Form parentForm, TextEditorControl control, string fileName) : base(parentForm, control, fileName)
+		CodeCompletionWindow(ICompletionDataProvider completionDataProvider, ICompletionData[] completionData, Form parentForm, TextEditorControl control) : base(parentForm, control)
 		{
 			this.dataProvider = completionDataProvider;
 			this.completionData = completionData;

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/InsightWindow/InsightWindow.cs

@@ -17,7 +17,7 @@ namespace ICSharpCode.TextEditor.Gui.InsightWindow
 {
 	public class InsightWindow : AbstractCompletionWindow
 	{
-		public InsightWindow(Form parentForm, TextEditorControl control, string fileName) : base(parentForm, control, fileName)
+		public InsightWindow(Form parentForm, TextEditorControl control) : base(parentForm, control)
 		{
 			SetStyle(ControlStyles.UserPaint, true);
 			SetStyle(ControlStyles.OptimizedDoubleBuffer, true);
@@ -166,7 +166,7 @@ namespace ICSharpCode.TextEditor.Gui.InsightWindow
 			}
 		}
 		
-		public void AddInsightDataProvider(IInsightDataProvider provider)
+		public void AddInsightDataProvider(IInsightDataProvider provider, string fileName)
 		{
 			provider.SetupDataProvider(fileName, control.ActiveTextAreaControl.TextArea);
 			if (provider.InsightDataCount > 0) {

src/Main/Base/Project/Src/Gui/Pads/FileScout.cs

@@ -19,56 +19,6 @@ using ICSharpCode.SharpDevelop.Project;
 
 namespace ICSharpCode.SharpDevelop.Gui
 {
-	class FileIcon
-	{
-		[DllImport("shell32.dll")]
-		static extern IntPtr SHGetFileInfo(string pszPath,
-		                                   uint dwFileAttributes,
-		                                   out SHFILEINFO psfi,
-		                                   uint cbfileInfo,
-		                                   SHGFI uFlags);
-		
-		[StructLayout(LayoutKind.Sequential)]
-		struct SHFILEINFO
-		{
-			public IntPtr hIcon;
-			public int iIcon;
-			public uint dwAttributes;
-			
-			[MarshalAs(UnmanagedType.LPStr, SizeConst = 260)]
-			public string szDisplayName;
-			
-			[MarshalAs(UnmanagedType.LPStr, SizeConst = 80)]
-			public string szTypeName;
-		}
-		
-		enum SHGFI
-		{
-			SmallIcon			= 0x00000001,
-			LargeIcon			= 0x00000000,
-			Icon					= 0x00000100,
-			DisplayName			= 0x00000200,
-			Typename				= 0x00000400,
-			SysIconIndex		= 0x00004000,
-			UseFileAttributes	= 0x00000010
-		}
-		
-		public static Bitmap GetBitmap(string strPath, bool bSmall)
-		{
-			SHFILEINFO info = new SHFILEINFO();
-			int cbFileInfo = Marshal.SizeOf(info);
-			SHGFI flags;
-			
-			if(bSmall) {
-				flags = SHGFI.Icon|SHGFI.SmallIcon|SHGFI.UseFileAttributes;
-			} else {
-				flags = SHGFI.Icon|SHGFI.LargeIcon|SHGFI.UseFileAttributes;
-			}
-			
-			SHGetFileInfo(strPath, 256, out info, (uint)cbFileInfo, flags);
-			return Bitmap.FromHicon(info.hIcon);
-		}
-	}
 	public enum DriveType {
 		Unknown     = 0,
 		NoRoot      = 1,

src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs

@@ -324,10 +324,10 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
 		public void ShowInsightWindow(IInsightDataProvider insightDataProvider)
 		{
 			if (insightWindow == null || insightWindow.IsDisposed) {
-				insightWindow = new InsightWindow(((Form)WorkbenchSingleton.Workbench), this, FileName);
+				insightWindow = new InsightWindow(((Form)WorkbenchSingleton.Workbench), this);
 				insightWindow.Closed += new EventHandler(CloseInsightWindow);
 			}
-			insightWindow.AddInsightDataProvider(insightDataProvider);
+			insightWindow.AddInsightDataProvider(insightDataProvider, this.FileName);
 			insightWindow.ShowInsightWindow();
 		}