Combine common parts of Column and Row into LinearArrangement

[libs/gltk.git] / source / column.h

diff --git a/source/column.h b/source/column.h
index b6092bb5dded802e92fb579ad8569218dd00399e..75ee1d334fd4c10ec135910669c3f454f5a4ebb1 100644 (file)
--- a/source/column.h
+++ b/source/column.h
@@ -1,38 +1,18 @@
 #ifndef MSP_GLTK_COLUMN_H_
 #define MSP_GLTK_COLUMN_H_
 
-#include <msp/datafile/objectloader.h>
-#include "arrangement.h"
+#include "lineararrangement.h"
 
 namespace Msp {
 namespace GLtk {
 
-class Column: public Arrangement
+class Column: public LinearArrangement
 {
-public:
-       class Loader: public DataFile::ObjectLoader<Column>
-       {
-       public:
-               Loader(Column &);
-       private:
-               void split();
-       };
-
-private:
-       Edge next_bottom;
-       bool first;
-       bool split_here;
-       int gravity;
-
 public:
        Column(Layout &);
 
-       void split();
-
 private:
-       virtual void process_widget(Widget &, Side, bool);
        virtual void finish_widget(Widget &);
-       virtual void finish_slot();
 };
 
 } // namespace GLtk