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

diff --git a/source/entry.h b/source/entry.h
index 0573671..3c7ab63 100644
--- a/source/entry.h
+++ b/source/entry.h
@@ -16,9 +16,12 @@ 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 MSPGLTK_API Entry: virtual public Widget, private Container
 {
@@ -42,15 +45,15 @@ private:
 	bool multiline = false;
 	unsigned edit_width = 10;
 	unsigned edit_height = 1;
-	unsigned edit_pos = 0;
-	unsigned first_row = 0;
+	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;
-	unsigned selection_pos = 0;
+	std::size_t selection_pos = 0;
 
 public:
 	Entry(const std::string & = std::string());
@@ -62,17 +65,17 @@ private:
 
 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. */
@@ -98,8 +101,8 @@ private:
 	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();