X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.h;h=62a451100e7f21391240fcb647924be539d9a88d;hb=762a689d799075c0a10e1633bf95d53de80b4572;hp=302551422e9a5bd9409eae4624cada8373ce04af;hpb=b61361ee9f1f049fb3c22a38f68c757c7ca54cd0;p=libs%2Fgltk.git

diff --git a/source/style.h b/source/style.h
index 3025514..62a4511 100644
--- 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>
@@ -31,21 +33,21 @@ public:
 		void unnamed_part();
 	};
 
-	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_];
-	PartSeq parts;
+	const GL::Sampler *sampler = nullptr;
+	std::vector<Part> 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 PartSeq &get_parts() const { return parts; }
-	const Part *get_part(const std::string &) const;
+	const GL::Sampler &get_sampler() const;
+	const std::vector<Part> &get_parts() const { return parts; }
+	const Part *find_part(const std::string &) const;
+	bool compare_states(State, State) const;
 };
 
 } // namespace GLtk