Collapse the two implementations of Entry::set_edit_position

[libs/gltk.git] / source / entry.h

diff --git a/source/entry.h b/source/entry.h
index 1594c68d8e7bb883eebdb04362a6b4db552fa26f..b6b4998662a91cba957fe43396ec90316e34a15e 100644 (file)
--- a/source/entry.h
+++ b/source/entry.h
@@ -22,6 +22,16 @@ Special parts:
 class Entry: virtual public Widget, private Container
 {
 public:
+       class Loader: public DataFile::DerivedObjectLoader<Entry, Widget::Loader>
+       {
+       public:
+               Loader(Entry &);
+
+       private:
+               void multiline(bool);
+       };
+
+       // Deprecated
        sigc::signal<void> signal_enter;
 
 private:
@@ -35,6 +45,9 @@ private:
        const Part *text_part;
        VSlider *slider;
        bool got_key_press;
+       bool cursor_blink;
+       bool selection_active;
+       unsigned selection_pos;
 
 public:
        Entry(const std::string & = std::string());
@@ -42,12 +55,18 @@ public:
        virtual const char *get_class() const { return "entry"; }
 
 private:
-       virtual void autosize_special(const Part &, Geometry &);
+       virtual void autosize_special(const Part &, Geometry &) const;
 
 public:
        void set_text(const std::string &);
+       void insert(unsigned, const std::string &);
+       void erase(unsigned, unsigned);
        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; }
+       bool get_selection(unsigned &, unsigned &) const;
+
        /** Sets the minimum size of the editing area, in characters and rows.  This
        only affects autosizing. */
        void set_edit_size(unsigned w, unsigned h);
@@ -60,15 +79,21 @@ private:
        virtual void render_special(const Part &, GL::Renderer &) const;
 
 public:
-       virtual void key_press(unsigned, unsigned);
-       virtual void character(wchar_t);
+       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 &);
 private:
        virtual void on_geometry_change();
        virtual void on_style_change();
 
-       void set_edit_position(unsigned);
-       void reposition_slider();
+       void move_edit_position(Navigation, bool);
+       void set_edit_position(unsigned, bool);
+       void erase_selection();
+       void check_cursor_blink();
        void check_view_range();
        void slider_value_changed(double);
 };