Simplify constructors with C++11

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

diff --git a/source/style.h b/source/style.h
index 08e274c3803755d1ef1432a7bfcc154ff7eb3962..ee25b251dcb50ba932efe40d368f465ab78719c9 100644 (file)
--- a/source/style.h
+++ b/source/style.h
@@ -3,7 +3,9 @@
 
 #include <msp/gl/color.h>
 #include <msp/gl/font.h>
+#include <msp/gl/sampler.h>
 #include <msp/datafile/objectloader.h>
+#include "mspgltk_api.h"
 #include "part.h"
 
 namespace Msp {
@@ -15,7 +17,7 @@ class Resources;
 Styles define what wigets look like.  They are made up of Parts and some
 generic properties.
 */
-class Style
+class MSPGLTK_API Style
 {
 public:
        class Loader: public DataFile::CollectionObjectLoader<Style, Resources>
@@ -25,26 +27,29 @@ public:
 
        private:
                void font(const std::string &);
-               void font_color(float, float, float);
-               void part();
+               void font_color_normal(float, float, float);
+               void font_color(State, float, float, float);
                void part(const std::string &);
+               void unnamed_part();
        };
 
        typedef std::list<Part> PartSeq;
 
 private:
-       const GL::Font *font;
-       unsigned font_size;
-       GL::Color font_color;
+       const GL::Font *font = 0;
+       unsigned font_size = 0;
+       GL::Color font_color[N_STATES_];
+       const GL::Sampler *sampler = 0;
        PartSeq parts;
 
 public:
-       Style();
        const GL::Font &get_font() const;
        unsigned get_font_size() const { return font_size; }
-       const GL::Color &get_font_color() const { return font_color; }
+       const GL::Color &get_font_color(State) const;
+       const GL::Sampler &get_sampler() const;
        const PartSeq &get_parts() const { return parts; }
        const Part *get_part(const std::string &) const;
+       bool compare_states(State, State) const;
 };
 
 } // namespace GLtk