X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=7137260a297165442e0554011b0334ef0149a6d1;hb=1e06dc208a02e68cf1bb127927e3ad5af3657c58;hp=48b647b71850b464bf8da56f102170d64bc8cf6e;hpb=aba0416fb73e17d068b30ff163c2fedcb0254da2;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 48b647b..7137260 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -58,6 +58,11 @@ void Widget::set_style(const string &s)
 	update_style();
 }
 
+void Widget::set_tooltip(const string &t)
+{
+	tooltip = t;
+}
+
 void Widget::set_visible(bool v)
 {
 	if(v==visible)
@@ -65,8 +70,7 @@ void Widget::set_visible(bool v)
 
 	visible=v;
 
-	if(!visible && parent)
-		parent->child_hidden(*this);
+	signal_visibility_changed.emit(visible);
 }
 
 void Widget::set_focus()
@@ -76,7 +80,7 @@ void Widget::set_focus()
 	if(!visible)
 		throw InvalidState("Can't set focus on invisible widget");
 
-	parent->grab_focus(*this);
+	signal_request_focus.emit();
 }
 
 void Widget::render() const
@@ -89,14 +93,18 @@ void Widget::render() const
 	for(PartSeq::const_iterator i=style->get_parts().begin(); i!=style->get_parts().end(); ++i)
 	{
 		if(i->get_name().empty())
-			render_graphic(*i);
+		{
+			GL::PushMatrix push_;
+			i->render(geom, state);
+		}
+			//render_graphic(*i);
 		else
 			render_special(*i);
 	}
 	GL::pop_matrix();
 }
 
-void Widget::render_graphic(const Part &part) const
+/*void Widget::render_graphic(const Part &part) const
 {
 	GL::push_matrix();
 	part.render(geom, state);
@@ -124,7 +132,7 @@ void Widget::render_text(const Part &part, const string &text) const
 	font->draw_string(text, imm);
 
 	GL::pop_matrix();
-}
+}*/
 
 void Widget::pointer_enter()
 {
@@ -158,16 +166,16 @@ void Widget::update_style()
 	on_style_change();
 }
 
-void Widget::set_parent(Panel *p)
+void Widget::set_parent(Container *p)
 {
 	if(parent && p)
-		throw InvalidState("Widget is already in a Panel");
+		throw InvalidState("Widget is already in a Container");
 	parent=p;
 
 	on_reparent();
 }
 
-void Widget::set_parent(Widget &w, Panel *p)
+void Widget::set_parent(Widget &w, Container *p)
 {
 	w.set_parent(p);
 }