Fixed SD2-1013: Disposing splash screen image stream

Fixed SD2-1015: "Show Tab Order" rectangles are gone when switching between views.

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

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs

@@ -146,6 +146,11 @@ namespace ICSharpCode.FormsDesigner
 			ISelectionService selectionService = (ISelectionService)designSurface.GetService(typeof(ISelectionService));
 			selectionService.SelectionChanged  += SelectionChangedHandler;
 			
+			if (IsTabOrderMode) { // fixes SD2-1015
+				tabOrderMode = false; // let ShowTabOrder call the designer command again
+				ShowTabOrder();
+			}
+			
 			LoggingService.Info("Form Designer: END INITIALIZE");
 		}
 		

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ShowTabOrder/ITabOrder.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+/*
 using System;
 using System.Drawing;
 
@@ -42,3 +43,4 @@ namespace ICSharpCode.FormsDesigner
 		
 	}
 }
+*/

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ShowTabOrder/TabIndexControl.cs

@@ -5,6 +5,7 @@
 //     <version>$Revision$</version>
 // </file>
 
+/*
 using System;
 using System.Diagnostics;
 using System.Drawing;
@@ -100,3 +101,4 @@ namespace ICSharpCode.FormsDesigner
 		}
 	}
 }
+*/

src/Main/StartUp/Project/Dialogs/SplashScreen.cs

@@ -46,9 +46,8 @@ namespace ICSharpCode.SharpDevelop
 			#else
 			string versionText = VersionText;
 			#endif
-			using (Stream stream = typeof(SplashScreenForm).Assembly.GetManifestResourceStream("Resources.SplashScreen.jpg")) {
-				bitmap = new Bitmap(stream);
-			}
+			// Stream must be kept open for the lifetime of the bitmap
+			bitmap = new Bitmap(typeof(SplashScreenForm).Assembly.GetManifestResourceStream("Resources.SplashScreen.jpg"));
 			this.ClientSize = bitmap.Size;
 			using (Font font = new Font("Sans Serif", 4)) {
 				using (Graphics g = Graphics.FromImage(bitmap)) {