X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fstyle.cpp;h=001b36937e03f4ab03261043d3414ae9ce49060e;hb=8fc5cb226f0c2b36298f51b3d2501b04ebb11b8a;hp=8eb5de1e79cb7853a1828dfb12248551204ed787;hpb=787dd5572e904a87686e7309401b86e0c528d823;p=libs%2Fgltk.git

diff --git a/source/style.cpp b/source/style.cpp
index 8eb5de1..001b369 100644
--- a/source/style.cpp
+++ b/source/style.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "resources.h"
 #include "style.h"
 
@@ -13,10 +6,18 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Style::Style(Resources &r):
-	font(&r.get_default_font())
+Style::Style():
+	font(0),
+	font_size(0)
 { }
 
+const GL::Font &Style::get_font() const
+{
+	if(!font)
+		throw logic_error("!font");
+	return *font;
+}
+
 const Part *Style::get_part(const string &name) const
 {
 	for(PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
@@ -31,6 +32,12 @@ Style::Loader::Loader(Style &s, Resources &r):
 	style(s),
 	res(r)
 {
+	if(!style.font)
+	{
+		style.font = &r.get_default_font();
+		style.font_size = style.font->get_native_size();
+	}
+
 	add("font",       &Style::font);
 	add("font_color", &Loader::font_color);
 	add("part",       static_cast<void (Loader::*)()>(&Loader::part));