X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=a3b160735b61ad22b31704296db48ff9c71b5d70;hb=aa939035cbb1bc2b89f77255953b2927690e4cca;hp=1594c68d8e7bb883eebdb04362a6b4db552fa26f;hpb=d2d5b4c4dedf90a42dd2baff8334318b1d000f64;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index 1594c68..a3b1607 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -22,6 +22,16 @@ 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);
+	};
+
+	// Deprecated
 	sigc::signal<void> signal_enter;
 
 private:
@@ -42,7 +52,7 @@ public:
 	virtual const char *get_class() const { return "entry"; }
 
 private:
-	virtual void autosize_special(const Part &, Geometry &);
+	virtual void autosize_special(const Part &, Geometry &) const;
 
 public:
 	void set_text(const std::string &);
@@ -60,15 +70,16 @@ private:
 	virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
-	virtual void key_press(unsigned, unsigned);
-	virtual void character(wchar_t);
+	virtual void touch_press(int, int, unsigned);
+	virtual bool key_press(unsigned, unsigned);
+	virtual bool character(wchar_t);
 	virtual void focus_out();
+	virtual bool navigate(Navigation);
 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);
 };