Merge branch 'v2_develop' into v2_drawframe-method_2983

Terminal.Gui/View/View.cs

@@ -495,7 +495,7 @@ public override string ToString ()
 		protected override void Dispose (bool disposing)
 		{
 			LineCanvas.Dispose ();
-			
+
 			Margin?.Dispose ();
 			Margin = null;
 			Border?.Dispose ();
@@ -513,8 +513,9 @@ protected override void Dispose (bool disposing)
 				Remove (subview);
 				subview.Dispose ();
 			}
-			
+
 			base.Dispose (disposing);
+			System.Diagnostics.Debug.Assert (InternalSubviews.Count == 0);
 		}
 	}
 }

Terminal.Gui/Views/Wizard/WizardStep.cs

@@ -1,4 +1,4 @@
-namespace Terminal.Gui; 
+namespace Terminal.Gui;
 
 /// <summary>
 /// Represents a basic step that is displayed in a <see cref="Wizard"/>. The <see cref="WizardStep"/> view is divided horizontally in two. On the left is the
@@ -39,7 +39,7 @@ public class WizardStep : FrameView {
 	//private string title = string.Empty;
 
 	// The contentView works like the ContentView in FrameView.
-	private View contentView = new View () { Data = "WizardContentView" };
+	private View contentView = new View () { Id = "WizardContentView" };
 
 	/// <summary>
 	/// Sets or gets help text for the <see cref="WizardStep"/>.If <see cref="WizardStep.HelpText"/> is empty
@@ -185,8 +185,12 @@ public override void Remove (View view)
 		}
 
 		SetNeedsDisplay ();
-		var touched = view.Frame;
-		contentView.Remove (view);
+		var container = view?.SuperView;
+		if (container == this) {
+			base.Remove (view);
+		} else {
+			container?.Remove (view);
+		}
 
 		if (contentView.InternalSubviews.Count < 1) {
 			this.CanFocus = false;