X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=72345b797001c36aa3da241f3a43ef1147ff4a0e;hb=6d73e04329fc3752552773e4d11d7374caf779f6;hp=0bba6f0fbe0e26cd74018b81610d4a4a12b27aec;hpb=df07e8f3e239b146cbc458d3cbd69758e590d255;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index 0bba6f0..72345b7 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -22,6 +22,15 @@ Special parts:
 class Entry: virtual public Widget, private Container
 {
 public:
+	class Loader: public DataFile::DerivedObjectLoader<Entry, Widget::Loader>
+	{
+	public:
+		Loader(Entry &);
+
+	private:
+		void multiline(bool);
+	};
+
 	sigc::signal<void> signal_enter;
 
 private:
@@ -41,8 +50,10 @@ public:
 
 	virtual const char *get_class() const { return "entry"; }
 
-	virtual void autosize();
+private:
+	virtual void autosize_special(const Part &, Geometry &) const;
 
+public:
 	void set_text(const std::string &);
 	const std::string &get_text() const { return text.get(); }
 
@@ -54,19 +65,18 @@ public:
 	bool is_multiline() const { return multiline; }
 
 private:
-	virtual void rebuild_special(const Part &, CachedPart &);
+	virtual void rebuild_special(const Part &);
 	virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
-	virtual void key_press(unsigned, unsigned);
-	virtual void character(wchar_t);
+	virtual bool key_press(unsigned, unsigned);
+	virtual bool character(wchar_t);
 	virtual void focus_out();
 private:
 	virtual void on_geometry_change();
 	virtual void on_style_change();
 
 	void set_edit_position(unsigned);
-	void reposition_slider();
 	void check_view_range();
 	void slider_value_changed(double);
 };