X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=4d990009d81002ece8cc5a8caeb2ac73606e0b3c;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=92cbaae9ba9a3fc4e9c9fc8c1381010481a90d70;hpb=6deafc9f236b90175a303944815f7c0eac1c95c1;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 92cbaae..4d99000 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -10,20 +10,12 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Widget::Widget():
-	style(0),
-	state(NORMAL),
-	visible(true),
-	input_type(INPUT_NONE),
-	parent(0)
-{ }
-
 Widget::~Widget()
 {
 	if(parent)
 	{
 		Container *p = parent;
-		parent = 0;
+		parent = nullptr;
 		p->remove(*this);
 	}
 }
@@ -51,18 +43,17 @@ void Widget::autosize(Geometry &ageom) const
 		return;
 
 	ageom = Geometry(geom.x, geom.y, 0, 0);
-	const Style::PartSeq &parts = style->get_parts();
-	for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+	for(const Part &p: style->get_parts())
 	{
-		if(i->get_name().empty())
+		if(p.get_name().empty())
 		{
-			const Geometry &pgeom = i->get_geometry();
-			const Sides &pmargin = i->get_margin();
+			const Geometry &pgeom = p.get_geometry();
+			const Sides &pmargin = p.get_margin();
 			ageom.w = max(ageom.w, pgeom.w+pmargin.left+pmargin.right);
 			ageom.h = max(ageom.h, pgeom.h+pmargin.top+pmargin.bottom);
 		}
 		else
-			autosize_special(*i, ageom);
+			autosize_special(p, ageom);
 	}
 }
 
@@ -119,7 +110,7 @@ void Widget::set_parent(Container *p)
 	catch(...)
 	{
 		// The container has not yet added the widget as its child
-		parent = 0;
+		parent = nullptr;
 		throw;
 	}
 }
@@ -136,7 +127,7 @@ void Widget::update_style()
 	for(top=this; top->parent; top=top->parent) ;
 	Root *root = dynamic_cast<Root *>(top);
 	if(!root)
-		style = 0;
+		style = nullptr;
 	else
 	{
 		string sname = get_class();
@@ -169,11 +160,6 @@ void Widget::set_visible(bool v)
 	signal_visibility_changed.emit(visible);
 }
 
-void Widget::set_focusable(bool f)
-{
-	input_type = (f ? INPUT_TEXT : INPUT_NONE);
-}
-
 void Widget::set_focus()
 {
 	if(!parent)
@@ -235,13 +221,12 @@ void Widget::rebuild()
 		return;
 
 	PartCache::Rebuild rebuild_cache(part_cache);
-	const Style::PartSeq &parts = style->get_parts();
-	for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+	for(const Part &p: style->get_parts())
 	{
-		if(i->get_name().empty())
-			i->build(geom, state, part_cache);
+		if(p.get_name().empty())
+			p.build(geom, state, part_cache);
 		else
-			rebuild_special(*i);
+			rebuild_special(p);
 	}
 }
 
@@ -262,16 +247,15 @@ void Widget::render(GL::Renderer &renderer) const
 	int y = 0;
 	map_coords_to_root(x, y);
 	renderer.set_matrix(GL::Matrix::translation(x, y, 0));
-	const PartCache::PartList &parts = part_cache.get_parts();
-	for(PartCache::PartList::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+	for(const CachedPart &p: part_cache.get_parts())
 	{
-		if(i->mesh && i->texture)
+		if(p.mesh && p.texture)
 		{
-			renderer.set_texture(texture_tag, i->texture, &style->get_sampler());
-			i->mesh->draw(renderer);
+			renderer.set_texture(texture_tag, p.texture, &style->get_sampler());
+			p.mesh->draw(renderer);
 		}
-		else if(i->part)
-			render_special(*i->part, renderer);
+		else if(p.part)
+			render_special(*p.part, renderer);
 	}
 }