Changeset 5278

Timestamp:

01/11/11 16:15:14 (13 years ago)

Author:

mkommend

Message:

Corrected check in setter of ViewType in the ViewHost (ticket #1372).

File:

• trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs (modified) (1 diff)

trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/ViewHost.cs

@@ -108 +108 @@
       get { return viewType; }
       set {
-        if (viewType != value && value.GetType() != typeof(ViewHost)) {
+        if (viewType != value) {
           if (value != null && Content != null && !ViewCanShowContent(value, Content))
-            throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".",
-                                                      value, Content.GetType()));
+            throw new ArgumentException(string.Format("View \"{0}\" cannot display content \"{1}\".",                            value, Content.GetType()));
+          if (value != null && value.GetType() == typeof(ViewHost))
+            throw new ArgumentException("Directly nested ViewHosts are not allowed.");
+
           viewType = value;
           OnViewTypeChanged();