X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.h;h=a3b160735b61ad22b31704296db48ff9c71b5d70;hb=HEAD;hp=165b7c731a91ef110cf1a9180b57e96ae079ea59;hpb=b391f4b774d17c53dfd9062fc7c7a6b14f72f926;p=libs%2Fgltk.git

diff --git a/source/entry.h b/source/entry.h
index 165b7c7..3c7ab63 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"
 
@@ -15,14 +16,17 @@ Text entry field.
 
 Special parts:
 
-  text    The current text of the widget.  Graphics are ignored.
-  cursor  Indicates the current input position.  Fill_x is ignored.
-  slider  A vertical slider for multiline entries.
+  text       The current text of the widget.  Graphics are ignored.
+  cursor     Indicates the current input position.  Fill and align are taken
+             from the text part.
+  selection  Highlights the selected text.  Fill and align are taken from the
+             text part.
+  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 &);
@@ -36,45 +40,42 @@ public:
 	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;
+	std::size_t edit_pos = 0;
+	std::size_t 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;
+	std::size_t 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 &);
-	void insert(unsigned, const std::string &);
-	void erase(unsigned, unsigned);
+	void insert(std::size_t, const std::string &);
+	void erase(std::size_t, std::size_t);
 	const std::string &get_text() const { return text.get(); }
 
-	void set_edit_position(unsigned p) { set_edit_position(p, false); }
-	unsigned get_edit_position() const { return edit_pos; }
+	void set_edit_position(std::size_t p) { set_edit_position(p, false); }
+	std::size_t get_edit_position() const { return edit_pos; }
 	unsigned get_scroll_position() const { return first_row; }
 	unsigned get_visible_rows() const { return visible_rows; }
-	bool get_selection(unsigned &, unsigned &) const;
-	void translate_position(unsigned, unsigned &, unsigned &) const;
-	unsigned translate_position(unsigned, unsigned) const;
+	bool get_selection(std::size_t &, std::size_t &) const;
+	void translate_position(std::size_t, std::size_t &, std::size_t &) const;
+	std::size_t translate_position(std::size_t, std::size_t) const;
 
 	/** Sets the minimum size of the editing area, in characters and rows.  This
 	only affects autosizing. */
@@ -84,24 +85,24 @@ 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_size_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 adjust_edit_position_for_change(std::size_t, std::ptrdiff_t);
+	void set_edit_position(std::size_t, bool);
 	void erase_selection(bool);
 	void check_cursor_blink();
 	void check_view_range();