Merge from layout management branch.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18649 a95241bf-73f2-0310-859d-f6bbb57e9c96
2006-08-26 16:21:15 +00:00
parent 01595708f3
commit 9ecf9d1c1d
277 changed files with 45889 additions and 747 deletions
@@ -200,6 +200,15 @@ BColorControl::Archive(BMessage *archive, bool deep) const
 }


+void
+BColorControl::SetLayout(BLayout* layout)
+{
+	// We need to implement this method, since we have another SetLayout()
+	// method and C++ has this special method hiding "feature".
+	BControl::SetLayout(layout);
+}
+
+
 void
 BColorControl::SetValue(int32 value)
 {