X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=a3b160735b61ad22b31704296db48ff9c71b5d70;hb=46def086def19c58fb9e577312c07f2f7e758b34;hp=65a201a66730bde448d7341c918c690c10bb3ccb;hpb=022c6ccec48b5dca482239da4a4c38550377b188;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index 65a201a..a3b1607 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -22,17 +22,23 @@ Special parts:
 class Entry: virtual public Widget, private Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Entry, Widget::Loader>
 	{
 	public:
 		Loader(Entry &);
+
+	private:
+		void multiline(bool);
 	};
 
+	// Deprecated
 	sigc::signal<void> signal_enter;
 
 private:
 	Text text;
 	bool multiline;
+	unsigned edit_width;
+	unsigned edit_height;
 	unsigned edit_pos;
 	unsigned first_row;
 	unsigned visible_rows;
@@ -45,27 +51,35 @@ 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(); }
+
+	/** Sets the minimum size of the editing area, in characters and rows.  This
+	only affects autosizing. */
+	void set_edit_size(unsigned w, unsigned h);
+
 	void set_multiline(bool);
 	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 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);
 };