Adjust things to conform to changes in other libraries

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

diff --git a/source/style.h b/source/style.h
index 672a7eaa202a129d0771190f411d1a3c3a4cef2e..1eb05c33a286111f5debc65e5f194c38bf3c1bb4 100644 (file)
--- a/source/style.h
+++ b/source/style.h
@@ -3,6 +3,7 @@
 
 #include <msp/gl/color.h>
 #include <msp/gl/font.h>
+#include <msp/gl/sampler.h>
 #include <msp/datafile/objectloader.h>
 #include "part.h"
 
@@ -25,7 +26,8 @@ public:
 
        private:
                void font(const std::string &);
-               void font_color(float, float, float);
+               void font_color_normal(float, float, float);
+               void font_color(State, float, float, float);
                void part(const std::string &);
                void unnamed_part();
        };
@@ -35,16 +37,19 @@ public:
 private:
        const GL::Font *font;
        unsigned font_size;
-       GL::Color font_color;
+       GL::Color font_color[N_STATES_];
+       const GL::Sampler *sampler;
        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