Fixed some small bugs.

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

src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/DesignerGenerator/AbstractDesignerGenerator.cs

@@ -129,7 +129,7 @@ namespace ICSharpCode.FormDesigner
 		
 		public void MergeFormChanges(CodeCompileUnit unit)
 		{
-			if (tabs == null) Reparse();
+			Reparse();
 			
 			// find InitializeComponent method and the class it is declared in
 			CodeTypeDeclaration formClass = null;

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

@@ -326,6 +326,7 @@ namespace ICSharpCode.TextEditor
 				Point p = Control.MousePosition;
 				Point cp = PointToClient(p);
 				if (lineNumber >= 0) {
+					lineNumber = this.Document.GetVisibleLine(lineNumber);
 					p.Y = (p.Y - cp.Y) + (lineNumber * this.TextView.FontHeight) - this.virtualTop.Y;
 				}
 				p.Offset(3, 3);
@@ -537,12 +538,12 @@ namespace ICSharpCode.TextEditor
 						if (Document.CustomLineManager.IsReadOnly(curLineNr, false) == true)
 							return true;
 						if ((Caret.Column == 0) && (curLineNr - 1 >= 0) && keyData == Keys.Back &&
-							Document.CustomLineManager.IsReadOnly(curLineNr - 1, false) == true)
+						    Document.CustomLineManager.IsReadOnly(curLineNr - 1, false) == true)
 							return true;
 						if (keyData == Keys.Delete) {
 							LineSegment curLine = Document.GetLineSegment(curLineNr);
-							if (curLine.Offset + curLine.Length == Caret.Offset && 
+							if (curLine.Offset + curLine.Length == Caret.Offset &&
-								Document.CustomLineManager.IsReadOnly(curLineNr + 1, false) == true) {
+							    Document.CustomLineManager.IsReadOnly(curLineNr + 1, false) == true) {
 								return true;
 							}
 						}
@@ -820,6 +821,6 @@ namespace ICSharpCode.TextEditor
 		public event KeyEventHandler    KeyEventHandler;
 		public event DialogKeyProcessor DoProcessDialogKey;
 		
-		//internal void 
+		//internal void
 	}
 }

src/Main/Base/Project/Src/Dom/Implementations/ConstructedReturnType.cs

@@ -24,22 +24,22 @@ namespace ICSharpCode.SharpDevelop.Dom
 		// Return types that should be substituted for the generic types
 		// If a substitution is unknown (type could not be resolved), the list
 		// contains a null entry.
-		IList<IReturnType> typeParameters;
+		IList<IReturnType> typeArguments;
 		IReturnType baseType;
 		
 		public override IList<IReturnType> TypeArguments {
 			get {
-				return typeParameters;
+				return typeArguments;
 			}
 		}
 		
-		public ConstructedReturnType(IReturnType baseType, IList<IReturnType> typeParameters)
+		public ConstructedReturnType(IReturnType baseType, IList<IReturnType> typeArguments)
 		{
 			if (baseType == null)
 				throw new ArgumentNullException("baseType");
-			if (typeParameters == null)
+			if (typeArguments == null)
-				throw new ArgumentNullException("typeParameters");
+				throw new ArgumentNullException("typeArguments");
-			this.typeParameters = typeParameters;
+			this.typeArguments = typeArguments;
 			this.baseType = baseType;
 		}
 		
@@ -53,8 +53,10 @@ namespace ICSharpCode.SharpDevelop.Dom
 		public override int GetHashCode()
 		{
 			int code = baseType.GetHashCode();
-			foreach (IReturnType t in typeParameters) {
+			foreach (IReturnType t in typeArguments) {
-				code ^= t.GetHashCode();
+				if (t != null) {
+					code ^= t.GetHashCode();
+				}
 			}
 			return code;
 		}
@@ -80,7 +82,9 @@ namespace ICSharpCode.SharpDevelop.Dom
 				return CheckReturnType(t.ArrayElementType);
 			} else if (t.TypeArguments != null) {
 				foreach (IReturnType para in t.TypeArguments) {
-					if (CheckReturnType(para)) return true;
+					if (para != null) {
+						if (CheckReturnType(para)) return true;
+					}
 				}
 				return false;
 			} else {
@@ -106,9 +110,11 @@ namespace ICSharpCode.SharpDevelop.Dom
 				else
 					b = new StringBuilder(baseName, 0, pos, pos + 20);
 				b.Append('{');
-				for (int i = 0; i < typeParameters.Count; ++i) {
+				for (int i = 0; i < typeArguments.Count; ++i) {
 					if (i > 0) b.Append(',');
-					b.Append(typeParameters[i].DotNetName);
+					if (typeArguments[i] != null) {
+						b.Append(typeArguments[i].DotNetName);
+					}
 				}
 				b.Append('}');
 				return b.ToString();
@@ -147,7 +153,7 @@ namespace ICSharpCode.SharpDevelop.Dom
 		
 		IReturnType TranslateType(IReturnType input)
 		{
-			return TranslateType(input, typeParameters, false);
+			return TranslateType(input, typeArguments, false);
 		}
 		
 		public override List<IMethod> GetMethods()
@@ -215,9 +221,11 @@ namespace ICSharpCode.SharpDevelop.Dom
 			string r = "[ConstructedReturnType: ";
 			r += baseType;
 			r += "<";
-			for (int i = 0; i < typeParameters.Count; i++) {
+			for (int i = 0; i < typeArguments.Count; i++) {
 				if (i > 0) r += ",";
-				r += typeParameters[i];
+				if (typeArguments[i] != null) {
+					r += typeArguments[i];
+				}
 			}
 			return r + ">]";
 		}

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

@@ -281,6 +281,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		void DetachPadContents(bool dispose)
 		{
+			foreach (PadContentWrapper padContentWrapper in contentHash.Values) {
+				padContentWrapper.allowInitialize = false;
+			}
 			foreach (PadDescriptor content in ((DefaultWorkbench)wbForm).PadContentCollection) {
 				try {
 					PadContentWrapper padContentWrapper = contentHash[content.Class];
@@ -339,7 +342,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		{
 			PadDescriptor padDescriptor;
 			bool isInitialized = false;
-			bool allowInitialize = false;
+			internal bool allowInitialize = false;
 			
 			public IPadContent PadContent {
 				get {