Make the Text class interface more obvious by not using a reference to pointer

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

diff --git a/source/entry.h b/source/entry.h
index 2c9c31448cd4f2c6c3b6403297956109427b412e..7355067d2db2f634d3db1cd5fd9eb8c8e6e1dc1a 100644 (file)
--- a/source/entry.h
+++ b/source/entry.h
@@ -1,26 +1,54 @@
+/* $Id$
+
+This file is part of libmspgltk
+Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #ifndef MSP_GLTK_ENTRY_H_
 #define MSP_GLTK_ENTRY_H_
 
+#include "text.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
+/**
+Text entry field.
+
+Special parts:
+
+  text    The current text of the widget.  Graphics are ignored.
+  cursor  Indicates the current input position.  Fill_x is ignored.
+*/
 class Entry: public Widget
 {
 public:
+       class Loader: public Widget::Loader
+       {
+       public:
+               Loader(Entry &);
+       };
+
+private:
+       Text text;
+       unsigned edit_pos;
+
+public:
+       sigc::signal<void> signal_enter;
+
        Entry(const Resources &, const std::string & =std::string());
+
        void set_text(const std::string &);
-       const std::string &get_text() const { return text; }
-       void key_press(unsigned, unsigned, wchar_t);
-       void focus_in();
-       void focus_out();
+       const std::string &get_text() const { return text.get(); }
+
+       virtual void key_press(unsigned, unsigned, wchar_t);
 private:
-       std::string text;
-       unsigned edit_pos;
+       virtual const char *get_class() const { return "entry"; }
+       virtual void render_special(const Part &) const;
 
-       const char *get_class() const { return "entry"; }
-       void render_part(const Part &) const;
+       virtual void on_style_change();
 };
 
 } // namespace GLtk