X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstyle.h;h=56870da615b8e1a9efb7062d0fea9869c7512a4c;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=1eb05c33a286111f5debc65e5f194c38bf3c1bb4;hpb=6deafc9f236b90175a303944815f7c0eac1c95c1;p=libs%2Fgltk.git diff --git a/source/style.h b/source/style.h index 1eb05c3..56870da 100644 --- a/source/style.h +++ b/source/style.h @@ -5,6 +5,7 @@ #include #include #include +#include "mspgltk_api.h" #include "part.h" namespace Msp { @@ -16,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 @@ -35,14 +36,13 @@ public: typedef std::list 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; + 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;