Pass modifier state to key_press and key_release functions

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

diff --git a/source/entry.h b/source/entry.h
index 4854340a14f730a1fe90fcc9c847be1ce87514ce..cd80ab0ac573b860b44775dbaa1aefbe6b88af2e 100644 (file)
--- a/source/entry.h
+++ b/source/entry.h
@@ -31,6 +31,7 @@ public:
                void multiline(bool);
        };
 
+       // Deprecated
        sigc::signal<void> signal_enter;
 
 private:
@@ -44,6 +45,7 @@ private:
        const Part *text_part;
        VSlider *slider;
        bool got_key_press;
+       bool cursor_blink;
 
 public:
        Entry(const std::string & = std::string());
@@ -51,7 +53,7 @@ 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 &);
@@ -69,15 +71,19 @@ 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 check_cursor_blink();
        void check_view_range();
        void slider_value_changed(double);
 };