X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbutton.cpp;h=bc6fd274d7362dae651c7d15f37eafdbb62f7be7;hb=48fd4db84c4d0b43305d85f74de99eb4fef04fd6;hp=543782e8306a448e616377b6d435c01ee185b218;hpb=a38c924ff32081f5cd67c2b0e2d5ca61f0e99de2;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index 543782e..bc6fd27 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of libmspgltk
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include "button.h"
 #include "part.h"
 
@@ -16,9 +23,9 @@ void Button::set_text(const std::string &t)
 	text=t;
 }
 
-void Button::button_press(int x, int y, unsigned btn)
+void Button::button_press(int, int, unsigned btn)
 {
-	if(geom.is_inside(x, y) && btn==1)
+	if(btn==1)
 		state=ACTIVE;
 }
 
@@ -26,10 +33,10 @@ void Button::button_release(int x, int y, unsigned btn)
 {
 	if(btn==1)
 	{
-		if(geom.is_inside(x, y))
+		if(geom.is_inside_relative(x, y))
 		{
-			signal_clicked.emit();
 			state=HOVER;
+			signal_clicked.emit();
 		}
 		else
 			state=NORMAL;
@@ -46,12 +53,10 @@ void Button::pointer_leave()
 	state=NORMAL;
 }
 
-void Button::render_part(const Part &part) const
+void Button::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")
 		render_text(part, text);
-	else
-		Widget::render_part(part);
 }