X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.cpp;h=3c71499bde19cdc32794478687ef689e18f4e90b;hb=73afd124ab87e8bace98db55517a56c797a9b8c7;hp=5871a5fabd0c7db23b2a0dfea1a5c6e6902f0368;hpb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index 5871a5f..3c71499 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007, 2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -12,13 +12,11 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-Button::Button(const Resources &r, const std::string &t):
-	Widget(r),
+Button::Button(const std::string &t):
 	text(),
 	icon(0),
 	pressed(false)
 {
-	update_style();
 	set_text(t);
 }
 
@@ -32,6 +30,34 @@ void Button::set_icon(const GL::Texture2D *i)
 	icon = i;
 }
 
+void Button::render_special(const Part &part) const
+{
+	if(part.get_name()=="text")
+		text.render(part, geom);
+	if(part.get_name()=="icon" && icon)
+	{
+		Geometry rgeom;
+		rgeom.w = icon->get_width();
+		rgeom.h = icon->get_height();
+		part.get_alignment().apply(rgeom, geom, part.get_margin());
+
+		icon->bind();
+		GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
+		imm.color(1.0f, 1.0f, 1.0f);
+		imm.begin(GL::QUADS);
+		imm.texcoord(0, 0);
+		imm.vertex(rgeom.x, rgeom.y);
+		imm.texcoord(1, 0);
+		imm.vertex(rgeom.x+rgeom.w, rgeom.y);
+		imm.texcoord(1, 1);
+		imm.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
+		imm.texcoord(0, 1);
+		imm.vertex(rgeom.x, rgeom.y+rgeom.h);
+		imm.end();
+		GL::Texture::unbind();
+	}
+}
+
 void Button::button_press(int, int, unsigned btn)
 {
 	if(btn==1)
@@ -64,34 +90,6 @@ void Button::pointer_motion(int x, int y)
 	}
 }
 
-void Button::render_special(const Part &part) const
-{
-	if(part.get_name()=="text")
-		text.render(part, geom);
-	if(part.get_name()=="icon" && icon)
-	{
-		Geometry rgeom;
-		rgeom.w = icon->get_width();
-		rgeom.h = icon->get_height();
-		part.get_alignment().apply(rgeom, geom, part.get_margin());
-
-		icon->bind();
-		GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
-		imm.color(1.0f, 1.0f, 1.0f);
-		imm.begin(GL::QUADS);
-		imm.texcoord(0, 0);
-		imm.vertex(rgeom.x, rgeom.y);
-		imm.texcoord(1, 0);
-		imm.vertex(rgeom.x+rgeom.w, rgeom.y);
-		imm.texcoord(1, 1);
-		imm.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
-		imm.texcoord(0, 1);
-		imm.vertex(rgeom.x, rgeom.y+rgeom.h);
-		imm.end();
-		GL::Texture::unbind();
-	}
-}
-
 void Button::on_style_change()
 {
 	text.set_style(style);
@@ -106,7 +104,7 @@ Button::Loader::Loader(Button &btn):
 
 void Button::Loader::text(const std::string &t)
 {
-	static_cast<Button &>(wdg).text = t;
+	static_cast<Button &>(obj).text = t;
 }
 
 } // namespace GLtk