Move all child widget handling into Container

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

diff --git a/source/style.cpp b/source/style.cpp
index 0bc931188e7e93ee9356cae9e90bf79112d27ecd..50c2e774d5477201502f77ac2e98ad270793ad85 100644 (file)
--- 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"
 
@@ -14,9 +7,19 @@ namespace Msp {
 namespace GLtk {
 
 Style::Style(Resources &r):
-       font(&r.get_default_font())
+       font(&r.get_default_font()),
+       font_size(font->get_native_size())
 { }
 
+const Part *Style::get_part(const string &name) const
+{
+       for(PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+               if(i->get_name()==name)
+                       return &*i;
+
+       return 0;
+}
+
 
 Style::Loader::Loader(Style &s, Resources &r):
        style(s),
@@ -24,8 +27,10 @@ Style::Loader::Loader(Style &s, Resources &r):
 {
        add("font",       &Style::font);
        add("font_color", &Loader::font_color);
-       add("part",       &Loader::part);
-       add("special",    &Loader::special);
+       add("part",       static_cast<void (Loader::*)()>(&Loader::part));
+       add("part",       static_cast<void (Loader::*)(const std::string &)>(&Loader::part));
+       // Deprecated alias
+       add("special",    static_cast<void (Loader::*)(const std::string &)>(&Loader::part));
 }
 
 void Style::Loader::font_color(float r, float g, float b)
@@ -35,12 +40,10 @@ void Style::Loader::font_color(float r, float g, float b)
 
 void Style::Loader::part()
 {
-       Part p((string()));
-       load_sub(p, res);
-       style.parts.push_back(p);
+       part(string());
 }
 
-void Style::Loader::special(const string &n)
+void Style::Loader::part(const string &n)
 {
        Part p(n);
        load_sub(p, res);