Simplify constructors with C++11

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

diff --git a/source/entry.h b/source/entry.h
index b6b4998662a91cba957fe43396ec90316e34a15e..871024da89af32b33c4f8ae1864370a817f488e7 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,23 +32,25 @@ public:
                void multiline(bool);
        };
 
-       // Deprecated
-       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 cursor_blink;
-       bool selection_active;
-       unsigned selection_pos;
+       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 = 0;
+       VSlider *slider = 0;
+       bool got_key_press = false;
+       bool cursor_blink = true;
+       bool selection_active = false;
+       unsigned selection_pos = 0;
 
 public:
        Entry(const std::string & = std::string());
@@ -65,7 +68,11 @@ public:
 
        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. */
@@ -87,12 +94,13 @@ public:
        virtual bool navigate(Navigation);
        virtual void animate(const Time::TimeDelta &);
 private:
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_style_change();
 
        void move_edit_position(Navigation, bool);
+       void adjust_edit_position_for_change(unsigned, int);
        void set_edit_position(unsigned, bool);
-       void erase_selection();
+       void erase_selection(bool);
        void check_cursor_blink();
        void check_view_range();
        void slider_value_changed(double);