Ticket #5525: splitView.patch

headers/os/interface/SplitView.h

@@ -1 +1 @@
 /*
- * Copyright 2006, Haiku, Inc. All rights reserved.
+ * Copyright 2006-2010, Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _SPLIT_VIEW_H
@@ -16 +16 @@
                                     enum orientation orientation
                                         = B_HORIZONTAL,
                                     float spacing = 0.0f);
+                                BSplitView(BMessage* from);
     virtual                     ~BSplitView();
 
             void                SetInsets(float left, float top, float right,
@@ -59 +60 @@
     virtual void                SetLayout(BLayout* layout);
                                     // overridden to avoid use
 
+    virtual status_t            Archive(BMessage* into, bool deep = true) const;
+    virtual status_t            AllArchived(BMessage* into) const;
+    static  BArchivable*        Instantiate(BMessage* from);
+
 protected:
     virtual void                DrawSplitter(BRect frame,
                                     const BRect& updateRect,

src/kits/interface/SplitView.cpp

@@ -3 +3 @@
  * All rights reserved. Distributed under the terms of the MIT License.
  */
 
+#include <Archivable.h>
 #include <SplitView.h>
 
 #include <stdio.h>
@@ -12 +13 @@
 
 #include "SplitLayout.h"
 
+namespace {
+    const char* kSplitLayoutField = "BSplitView:layout";
+}
 
+
 BSplitView::BSplitView(enum orientation orientation, float spacing)
     :
     BView(NULL,
@@ -23 +28 @@
 }
 
 
+BSplitView::BSplitView(BMessage* from)
+    :
+    BView(BUnarchiver::PrepareArchive(from)),
+    fSplitLayout(NULL)
+{
+    BUnarchiver unarchiver(from);
+    unarchiver.FindObject(kSplitLayoutField,
+        BUnarchiver::B_DONT_ASSUME_OWNERSHIP, fSplitLayout);
+}
+
+
 BSplitView::~BSplitView()
 {
 }
@@ -216 +232 @@
 }
 
 
+status_t
+BSplitView::Archive(BMessage* into, bool deep) const
+{
+    return BArchiver(into).Finish(BView::Archive(into, deep));
+}
+
+
+status_t
+BSplitView::AllArchived(BMessage* into) const
+{
+    BArchiver archiver(into);
+    status_t err = BView::AllArchived(into);
+    
+    if (err == B_OK && archiver.IsArchived(fSplitLayout))
+        return archiver.AddArchivable(kSplitLayoutField, fSplitLayout);
+
+    return B_NAME_NOT_FOUND;
+}
+
+
+BArchivable*
+BSplitView::Instantiate(BMessage* from)
+{
+    if (validate_instantiation(from, "BSplitView"))
+        return new BSplitView(from);
+    return NULL;
+}
+
+
 void
 BSplitView::DrawSplitter(BRect frame, const BRect& updateRect,
     enum orientation orientation, bool pressed)