X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=b8bae562c7fd2b53b7322cc6c09f6baaa3b2f3d9;hb=75a16eae9eb2714f8112d46fa5b8f7908b6d2487;hp=bd986c2ca82c26f64daa9248a5f874045f1ecf18;hpb=c2635c5a3dca6a6cea5562fd387beb0662b18cf0;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index bd986c2..b8bae56 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -8,6 +8,7 @@ Distributed under the LGPL
 #ifndef MSP_GLTK_ENTRY_H_
 #define MSP_GLTK_ENTRY_H_
 
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
@@ -23,22 +24,29 @@ Special parts:
 */
 class Entry: public Widget
 {
+public:
+	class Loader: public Widget::Loader
+	{
+	public:
+		Loader(Entry &);
+	};
+
 private:
-	std::string text;
+	Text text;
 	unsigned edit_pos;
 
 public:
+	sigc::signal<void> signal_enter;
+
 	Entry(const Resources &, const std::string & =std::string());
 
 	void set_text(const std::string &);
-	const std::string &get_text() const { return text; }
+	const std::string &get_text() const { return text.get(); }
 
-	void key_press(unsigned, unsigned, wchar_t);
-	void focus_in();
-	void focus_out();
+	virtual void key_press(unsigned, unsigned, wchar_t);
 private:
-	const char *get_class() const { return "entry"; }
-	void render_part(const Part &) const;
+	virtual const char *get_class() const { return "entry"; }
+	virtual void render_special(const Part &) const;
 };
 
 } // namespace GLtk