From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 2 Nov 2007 20:22:42 +0000 (+0000)
Subject: Adapt to DataFile changes
X-Git-Tag: 0.9~28
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=be8ea35fe6eabe4c68d2d337634f21c63c964265;p=libs%2Fgltk.git

Adapt to DataFile changes
---

diff --git a/source/graphic.cpp b/source/graphic.cpp
index 3579610..611cdb4 100644
--- a/source/graphic.cpp
+++ b/source/graphic.cpp
@@ -74,7 +74,7 @@ Graphic::Loader::Loader(Graphic &g, Resources &r):
 
 void Graphic::Loader::texture(const string &n)
 {
-	graph.texture=&res.get<GL::Texture2D>(n);
+	graph.texture=res.get<GL::Texture2D>(n);
 	graph.slice=Geometry(0, 0, graph.texture->get_width(), graph.texture->get_height());
 }
 
diff --git a/source/part.cpp b/source/part.cpp
index 1d96538..d65fc2e 100644
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -61,7 +61,7 @@ Part::Loader::~Loader()
 
 void Part::Loader::graphic(State s, const string &n)
 {
-	part.graphic[s]=&res.get<Graphic>(n);
+	part.graphic[s]=res.get<Graphic>(n);
 }
 
 void Part::Loader::align(int x, int y)
diff --git a/source/resources.cpp b/source/resources.cpp
index f146bbc..3b0f4f9 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -43,7 +43,7 @@ GL::Font *Resources::create_font(const string &name)
 GL::Texture2D *Resources::create_texture(const string &name)
 {
 	RefPtr<GL::Texture2D> tex=new GL::Texture2D;
-	tex->image((path/(name+".png")).str());
+	tex->load_image((path/(name+".png")).str());
 	tex->set_min_filter(GL::LINEAR);
 	return tex.release();
 }
@@ -59,7 +59,7 @@ Resources::Loader::Loader(Resources &r):
 
 void Resources::Loader::default_font(const string &name)
 {
-	res.default_font=&res.get<GL::Font>(name);
+	res.default_font=res.get<GL::Font>(name);
 }
 
 void Resources::Loader::font(const string &name)
diff --git a/source/widget.cpp b/source/widget.cpp
index f03ed39..8674a13 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -58,7 +58,7 @@ void Widget::update_style()
 		sname+='-';
 		sname+=style_name;
 	}
-	style=&res.get<Style>(sname);
+	style=res.get<Style>(sname);
 }
 
 void Widget::render_part(const Part &part) const