X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=0ff5466a613e11bcd545002b4409727b253ef9ef;hb=ef4660c4bdf38e126e13b426649fc2f997027b65;hp=c880bb4f8f639324e880cdce656a9c517173ad1f;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index c880bb4..0ff5466 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -1,13 +1,14 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #ifndef MSP_GLTK_ENTRY_H_
 #define MSP_GLTK_ENTRY_H_
 
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
@@ -31,21 +32,26 @@ public:
 	};
 
 private:
-	std::string text;
+	Text text;
+	bool multiline;
 	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 set_multiline(bool);
+	bool is_multiline() const { return multiline; }
 
 	virtual void key_press(unsigned, unsigned, wchar_t);
-	virtual void focus_in();
-	virtual void focus_out();
 private:
 	virtual const char *get_class() const { return "entry"; }
 	virtual void render_special(const Part &) const;
+
+	virtual void on_style_change();
 };
 
 } // namespace GLtk