Fixed SD2-411: Code completition doesn't show parent class (nested classes)

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

src/AddIns/DisplayBindings/FormDesigner/Project/Src/FormDesigner/Services/UIService.cs

@@ -65,28 +65,17 @@ namespace ICSharpCode.FormDesigner.Services
 		#region Show error functions
 		public void ShowError(Exception ex)
 		{
-			ShowError(ex, null);
+			MessageService.ShowError(ex);
 		}
 		
 		public void ShowError(string message)
 		{
-			ShowError(null, message);
+			MessageService.ShowError(message);
 		}
 		
 		public void ShowError(Exception ex, string message)
 		{
-//			string msg = String.Empty;
+			MessageService.ShowError(ex, message);
-//			
-//			if (ex != null) {
-//				msg = "Exception occurred: " + ex.ToString() + "\n";
-//			}
-//			
-//			if (message != null) {
-//				msg += message;
-//			}
-			
-			
-			MessageBox.Show(GetDialogOwnerWindow(), ex.Message, ResourceService.GetString("Global.ErrorText"), MessageBoxButtons.OK, MessageBoxIcon.Error);
 		}
 		#endregion
 		

src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs

@@ -928,6 +928,20 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
 						result.Add(m);
 					}
 				}
+				if (callingClass.DeclaringType != null) {
+					result.Add(callingClass.DeclaringType);
+					members.Clear();
+					t = callingClass.DeclaringType.DefaultReturnType;
+					members.AddRange(t.GetMethods());
+					members.AddRange(t.GetFields());
+					members.AddRange(t.GetEvents());
+					members.AddRange(t.GetProperties());
+					foreach (IMember m in members) {
+						if (m.IsStatic) {
+							result.Add(m);
+						}
+					}
+				}
 			}
 			foreach (KeyValuePair<string, List<LocalLookupVariable>> pair in lookupTableVisitor.Variables) {
 				if (pair.Value != null && pair.Value.Count > 0) {