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
@@ -33,6 +33,8 @@ class BColorControl : public BControl {
 		static BArchivable*	Instantiate(BMessage* archive);
 		virtual status_t	Archive(BMessage* archive, bool deep = true) const;

+		virtual void		SetLayout(BLayout* layout);
+
 		virtual void		SetValue(int32 color_value);
 		void				SetValue(rgb_color color);
 		rgb_color			ValueAsColor();