X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=2c9cb357fa55d38215c64358b4f1ae22fe972932;hb=91997dd;hp=8853ad7efe6daf8a4812313f5754ade2b900c211;hpb=deb15ee122f963ca41121e8358d5845401ac43ca;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 8853ad7..2c9cb35 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -20,9 +20,7 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Entry::Entry(const Resources &r, const string &t):
-	Widget(r),
-	Container(r),
+Entry::Entry(const string &t):
 	text(),
 	multiline(false),
 	edit_pos(0),
@@ -31,7 +29,6 @@ Entry::Entry(const Resources &r, const string &t):
 	text_part(0),
 	slider(0)
 {
-	update_style();
 	set_text(t);
 }
 
@@ -51,7 +48,7 @@ void Entry::set_multiline(bool m)
 	{
 		if(!slider)
 		{
-			slider = new VSlider(res);
+			slider = new VSlider;
 			add(*slider);
 			slider->set_step(1);
 			slider->signal_value_changed.connect(sigc::mem_fun(this, &Entry::slider_value_changed));
@@ -159,9 +156,16 @@ void Entry::on_geometry_change()
 
 void Entry::on_style_change()
 {
+	text.set_style(style);
+
+	if(!style)
+	{
+		text_part = 0;
+		return;
+	}
+
 	text_part = style->get_part("text");
 
-	text.set_style(style);
 	reposition_slider();
 
 	if(multiline)
@@ -170,7 +174,7 @@ void Entry::on_style_change()
 
 void Entry::reposition_slider()
 {
-	if(!slider)
+	if(!style || !slider)
 		return;
 
 	if(const Part *slider_part = style->get_part("slider"))