Fixed SD2-783: GDI Handle leak

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1380 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Main/Base/Project/Src/Gui/Workbench/Layouts/LayoutConfiguration.cs

@@ -90,11 +90,17 @@ namespace ICSharpCode.SharpDevelop.Gui
 				return PropertyService.Get("Workbench.CurrentLayout", "Default");
 			}
 			set {
+				if (WorkbenchSingleton.InvokeRequired)
+					throw new InvalidOperationException("Invoke required");
 				if (value != CurrentLayoutName) {
-					
 					PropertyService.Set("Workbench.CurrentLayout", value);
-					WorkbenchSingleton.SafeThreadCall(WorkbenchSingleton.Workbench.WorkbenchLayout, "LoadConfiguration");
-					WorkbenchSingleton.SafeThreadCall(typeof(LayoutConfiguration), "OnLayoutChanged", EventArgs.Empty);
+					WorkbenchSingleton.Workbench.WorkbenchLayout.LoadConfiguration();
+					OnLayoutChanged(EventArgs.Empty);
+					#if DEBUG
+					GC.Collect();
+					GC.WaitForPendingFinalizers();
+					GC.Collect();
+					#endif
 				}
 			}
 		}

src/Main/Base/Project/Src/Services/IconService.cs

@@ -73,8 +73,9 @@ namespace ICSharpCode.Core
 		
 		public static Bitmap GetBitmap(string name)
 		{
-			if (ResourceService.GetBitmap(name) != null) {
-				return ResourceService.GetBitmap(name);
+			Bitmap bmp = ResourceService.GetBitmap(name);
+			if (bmp != null) {
+				return bmp;
 			}
 			
 			return ResourceService.GetBitmap("Icons.16x16.MiscFiles");
@@ -82,8 +83,11 @@ namespace ICSharpCode.Core
 		
 		public static Icon GetIcon(string name)
 		{
-			Bitmap bitmap = GetBitmap(name);
-			return Icon.FromHandle(bitmap.GetHicon());
+			Icon icon = ResourceService.GetIcon(name);
+			if (icon != null) {
+				return icon;
+			}
+			return ResourceService.GetIcon("Icons.16x16.MiscFiles");
 		}
 		
 		

src/Main/Base/Project/Src/TextEditor/Gui/Dialogs/GotoDialog.cs

@@ -7,6 +7,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.IO;
 using System.Drawing;
 using System.ComponentModel;
@@ -276,20 +277,26 @@ namespace ICSharpCode.SharpDevelop.Gui
 				foreach (IProject project in ProjectService.OpenSolution.Projects) {
 					IProjectContent projectContent = ParserService.GetProjectContent(project);
 					if (projectContent != null) {
-						foreach (IClass c in projectContent.Classes) {
-							string className = c.Name;
-							if (className.Length >= text.Length) {
-								if (className.ToLowerInvariant().IndexOf(lowerText) >= 0) {
-									list.Add(c);
-								}
-							}
-						}
+						AddClasses(lowerText, list, projectContent.Classes);
 					}
 				}
 			}
 			return list;
 		}
 		
+		void AddClasses(string lowerText, ArrayList list, IEnumerable<IClass> classes)
+		{
+			foreach (IClass c in classes) {
+				string className = c.Name;
+				if (className.Length >= lowerText.Length) {
+					if (className.ToLowerInvariant().IndexOf(lowerText) >= 0) {
+						list.Add(c);
+					}
+				}
+				AddClasses(lowerText, list, c.InnerClasses);
+			}
+		}
+		
 		void AddItem(string text, int imageIndex, object tag, double priority)
 		{
 			if (visibleEntries.ContainsKey(text))

src/Main/Core/Project/Src/Services/ResourceService/ResourceService.cs

@@ -65,6 +65,9 @@ namespace ICSharpCode.Core
 		static Hashtable localStrings = null;
 		static Hashtable localIcons   = null;
 		
+		static Dictionary<string, Icon> iconCache = new Dictionary<string, Icon>();
+		static Dictionary<string, Bitmap> bitmapCache = new Dictionary<string, Bitmap>();
+		
 		/// <summary>Strings resource managers for the current language</summary>
 		static List<ResourceManager> localStringsResMgrs = new List<ResourceManager>();
 		/// <summary>Image resource managers for the current language</summary>
@@ -182,6 +185,9 @@ namespace ICSharpCode.Core
 		
 		static void LoadLanguageResources(string language)
 		{
+			iconCache.Clear();
+			bitmapCache.Clear();
+			
 			try {
 				Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(language);
 			} catch (Exception) {
@@ -400,15 +406,22 @@ namespace ICSharpCode.Core
 		/// </exception>
 		public static Icon GetIcon(string name)
 		{
-			object iconobj = GetImageResource(name);
-			
-			if (iconobj == null) {
-				return null;
-			}
-			if (iconobj is Icon) {
-				return (Icon)iconobj;
-			} else {
-				return Icon.FromHandle(((Bitmap)iconobj).GetHicon());
+			lock (iconCache) {
+				Icon ico;
+				if (iconCache.TryGetValue(name, out ico))
+					return ico;
+				
+				object iconobj = GetImageResource(name);
+				if (iconobj == null) {
+					return null;
+				}
+				if (iconobj is Icon) {
+					ico = (Icon)iconobj;
+				} else {
+					ico = Icon.FromHandle(((Bitmap)iconobj).GetHicon());
+				}
+				iconCache[name] = ico;
+				return ico;
 			}
 		}
 		
@@ -427,9 +440,15 @@ namespace ICSharpCode.Core
 		/// </exception>
 		public static Bitmap GetBitmap(string name)
 		{
-			Bitmap b = (Bitmap)GetImageResource(name);
-			Debug.Assert(b != null, "Resource " + name);
-			return b;
+			lock (bitmapCache) {
+				Bitmap bmp;
+				if (bitmapCache.TryGetValue(name, out bmp))
+					return bmp;
+				bmp = (Bitmap)GetImageResource(name);
+				Debug.Assert(bmp != null, "Resource " + name);
+				bitmapCache[name] = bmp;
+				return bmp;
+			}
 		}
 	}
 }