Adjust event handling to match changes in mspgui

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

diff --git a/source/entry.h b/source/entry.h
index a8bbcd5d49f865c77ac0e276271684b62bb62590..058ef3fb38321df9c2e782888859a3d331daf684 100644 (file)
--- a/source/entry.h
+++ b/source/entry.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_ENTRY_H_
 #define MSP_GLTK_ENTRY_H_
 
@@ -35,6 +28,8 @@ public:
                Loader(Entry &);
        };
 
+       sigc::signal<void> signal_enter;
+
 private:
        Text text;
        bool multiline;
@@ -45,25 +40,30 @@ private:
        VSlider *slider;
 
 public:
-       sigc::signal<void> signal_enter;
+       Entry(const std::string & = std::string());
+
+       virtual const char *get_class() const { return "entry"; }
 
-       Entry(const Resources &, const std::string & =std::string());
+       virtual void autosize();
 
        void set_text(const std::string &);
        const std::string &get_text() const { return text.get(); }
        void set_multiline(bool);
        bool is_multiline() const { return multiline; }
 
-       virtual void key_press(unsigned, unsigned, wchar_t);
 private:
-       virtual const char *get_class() const { return "entry"; }
        virtual void render_special(const Part &) const;
 
+public:
+       virtual void key_press(unsigned, unsigned);
+       virtual void character(wchar_t);
+private:
        virtual void on_geometry_change();
        virtual void on_style_change();
+
        void reposition_slider();
-       void slider_value_changed(double);
        void check_view_range();
+       void slider_value_changed(double);
 };
 
 } // namespace GLtk