Ticket #5525: splitView.2.patch

src/kits/interface/SplitView.cpp

@@ -7 +7 @@
 
 #include <stdio.h>
 
+#include <Archivable.h>
 #include <ControlLook.h>
 #include <Cursor.h>
 
@@ -23 +24 @@
 }
 
 
+BSplitView::BSplitView(BMessage* from)
+    :
+    BView(BUnarchiver::PrepareArchive(from)),
+    fSplitLayout(NULL)
+{
+    BUnarchiver(from).Finish();
+}
+
+
 BSplitView::~BSplitView()
 {
 }
@@ -216 +226 @@
 }
 
 
+status_t
+BSplitView::Archive(BMessage* into, bool deep) const
+{
+    return BView::Archive(into, deep);
+}
+
+
+status_t
+BSplitView::AllUnarchived(const BMessage* from)
+{
+    status_t err = BView::AllUnarchived(from);
+    if (err == B_OK) {
+        fSplitLayout = dynamic_cast<BSplitLayout*>(GetLayout());
+        if (!fSplitLayout && GetLayout())
+            return B_BAD_TYPE;
+        else if (!fSplitLayout)
+            return B_ERROR;
+    }
+    return err;
+}
+
+
+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)

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            AllUnarchived(const BMessage* from);
+    static  BArchivable*        Instantiate(BMessage* from);
+
 protected:
     virtual void                DrawSplitter(BRect frame,
                                     const BRect& updateRect,