Use the override specifier when overriding a virtual function

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

diff --git a/source/entry.h b/source/entry.h
index 4854340a14f730a1fe90fcc9c847be1ce87514ce..0573671abfded057908d9fc320b0671e59a883e4 100644 (file)
--- 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 &);
@@ -31,32 +32,48 @@ public:
                void multiline(bool);
        };
 
-       sigc::signal<void> signal_enter;
+       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;
 
 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 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 &);
+       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);
        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; }
+       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;
+
        /** Sets the minimum size of the editing area, in characters and rows.  This
        only affects autosizing. */
        void set_edit_size(unsigned w, unsigned h);
@@ -65,19 +82,26 @@ 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 key_press(unsigned, unsigned);
-       virtual void character(wchar_t);
-       virtual void focus_out();
+       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 set_edit_position(unsigned);
-       void reposition_slider();
+       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();
        void check_view_range();
        void slider_value_changed(double);
 };