Use nullptr instead of 0 for pointers

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

diff --git a/source/style.h b/source/style.h
index 302551422e9a5bd9409eae4624cada8373ce04af..56870da615b8e1a9efb7062d0fea9869c7512a4c 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>
@@ -34,18 +36,20 @@ public:
        typedef std::list<Part> PartSeq;
 
 private:
-       const GL::Font *font;
-       unsigned font_size;
+       const GL::Font *font = nullptr;
+       unsigned font_size = 0;
        GL::Color font_color[N_STATES_];
+       const GL::Sampler *sampler = nullptr;
        PartSeq parts;
 
 public:
-       Style();
        const GL::Font &get_font() const;
        unsigned get_font_size() const { return font_size; }
        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