X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=0573671abfded057908d9fc320b0671e59a883e4;hb=d10d1de6d17c285c63d7b3cea549017aaa1ddb01;hp=58e45fbc7ac5014cd1d7b343b955bdecc32dcf14;hpb=474578fd04355c3247e8f9f6383d17e37c2c3015;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index 58e45fb..0573671 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -2,6 +2,7 @@
 #define MSP_GLTK_ENTRY_H_
 
 #include "container.h"
+#include "mspgltk_api.h"
 #include "text.h"
 #include "widget.h"
 
@@ -19,10 +20,10 @@ Special parts:
   cursor  Indicates the current input position.  Fill_x is ignored.
   slider  A vertical slider for multiline entries.
 */
-class Entry: virtual public Widget, private Container
+class MSPGLTK_API Entry: virtual public Widget, private Container
 {
 public:
-	class Loader: public DataFile::DerivedObjectLoader<Entry, Widget::Loader>
+	class MSPGLTK_API Loader: public DataFile::DerivedObjectLoader<Entry, Widget::Loader>
 	{
 	public:
 		Loader(Entry &);
@@ -33,33 +34,31 @@ public:
 
 	sigc::signal<void, unsigned> signal_edit_position_changed;
 	sigc::signal<void, unsigned> signal_scroll_position_changed;
+	sigc::signal<void, unsigned, unsigned> signal_selection_changed;
 	sigc::signal<void, const std::string &> signal_text_changed;
 
-	// 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;
-	const Part *text_part;
-	VSlider *slider;
-	bool got_key_press;
-	bool cursor_blink;
-	bool selection_active;
-	unsigned selection_pos;
+	bool multiline = false;
+	unsigned edit_width = 10;
+	unsigned edit_height = 1;
+	unsigned edit_pos = 0;
+	unsigned first_row = 0;
+	unsigned visible_rows = 1;
+	const Part *text_part = nullptr;
+	VSlider *slider = nullptr;
+	bool got_key_press = false;
+	bool cursor_blink = true;
+	bool selection_active = false;
+	unsigned selection_pos = 0;
 
 public:
 	Entry(const std::string & = std::string());
 
-	virtual const char *get_class() const { return "entry"; }
+	const char *get_class() const override { return "entry"; }
 
 private:
-	virtual void autosize_special(const Part &, Geometry &) const;
+	void autosize_special(const Part &, Geometry &) const override;
 
 public:
 	void set_text(const std::string &);
@@ -83,22 +82,23 @@ public:
 	bool is_multiline() const { return multiline; }
 
 private:
-	virtual void rebuild_special(const Part &);
-	virtual void render_special(const Part &, GL::Renderer &) const;
+	void rebuild_special(const Part &) override;
+	void render_special(const Part &, GL::Renderer &) const override;
 
 public:
-	virtual void touch_press(int, int, unsigned);
-	virtual bool key_press(unsigned, unsigned);
-	virtual bool character(wchar_t);
-	virtual void focus_in();
-	virtual void focus_out();
-	virtual bool navigate(Navigation);
-	virtual void animate(const Time::TimeDelta &);
+	void touch_press(int, int, unsigned) override;
+	bool key_press(unsigned, unsigned) override;
+	bool character(wchar_t) override;
+	void focus_in() override;
+	void focus_out() override;
+	bool navigate(Navigation) override;
+	void animate(const Time::TimeDelta &) override;
 private:
-	virtual void on_geometry_change();
-	virtual void on_style_change();
+	void on_size_change() override;
+	void on_style_change() override;
 
 	void move_edit_position(Navigation, bool);
+	void adjust_edit_position_for_change(unsigned, int);
 	void set_edit_position(unsigned, bool);
 	void erase_selection(bool);
 	void check_cursor_blink();