Simplify constructors with C++11

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

diff --git a/source/grid.h b/source/grid.h
index 0e71748b6a71bdd84da98bdd31c8bfa3957094c9..9324f95fac937b1bb53c1d1167a861da338109d8 100644 (file)
--- a/source/grid.h
+++ b/source/grid.h
@@ -1,13 +1,25 @@
 #ifndef MSP_GLTK_GRID_H_
 #define MSP_GLTK_GRID_H_
 
+#include <msp/datafile/objectloader.h>
 #include "arrangement.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
 
-class Grid: public Arrangement
+class MSPGLTK_API Grid: public Arrangement
 {
+public:
+       class Loader: public DataFile::ObjectLoader<Grid>
+       {
+       public:
+               Loader(Grid &);
+       private:
+               void next_row();
+               void skip();
+       };
+
 private:
        struct Column
        {
@@ -18,8 +30,8 @@ private:
        std::vector<Column> columns;
        Edge row_top;
        Edge row_bottom;
-       bool first_row;
-       unsigned column;
+       bool first_row = true;
+       unsigned column = 0;
 
 public:
        Grid(Layout &, unsigned);