Revised Input subhierarchy, separated bindings for Fl_Input and Fl_Input_ widgets

11 files changed, 690 insertions, 596 deletions

diff --git a/doc/fl_file_input.html b/doc/fl_file_input.html
index 499d80d..b319f2e 100644
--- a/doc/fl_file_input.html
+++ b/doc/fl_file_input.html
@@ -21,7 +21,7 @@
 
   <tr>
     <td>Fl_File_Input</td>
-    <td>FLTK.Widgets.Inputs.File</td>
+    <td>FLTK.Widgets.Inputs.Text.File</td>
   </tr>
 
 </table>
@@ -46,7 +46,7 @@
 
 
 <table class="function">
-  <tr><th colspan="2">Functions and Procedures</th></tr>
+  <tr><th colspan="2">Constructors</th></tr>
 
   <tr>
 <td><pre>
@@ -60,6 +60,13 @@ function Create
 </pre></td>
   </tr>
 
+</table>
+
+
+
+<table class="function">
+  <tr><th colspan="2">Functions and Procedures</th></tr>
+
   <tr>
 <td><pre>
 Fl_Boxtype down_box() const;
@@ -84,16 +91,6 @@ procedure Set_Down_Box
 
   <tr>
 <td><pre>
-virtual void draw();
-</pre></td>
-<td><pre>
-procedure Draw
-       (This : in out File_Input);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
 Fl_Color errorcolor() const;
 </pre></td>
 <td><pre>
@@ -129,11 +126,12 @@ function Handle
   <tr>
 <td><pre>
 int value(const char *str);
+
 int value(const char *str, int len);
 </pre></td>
 <td><pre>
 procedure Set_Value
-       (This : in out Input;
+       (This : in out File_Input;
         To   : in     String);
 </pre></td>
   </tr>
@@ -144,7 +142,7 @@ const char * value();
 </pre></td>
 <td><pre>
 function Get_Value
-       (This : in Input)
+       (This : in File_Input)
     return String;
 </pre></td>
   </tr>
@@ -152,6 +150,24 @@ function Get_Value
 </table>
 
 
+
+<table class="function">
+  <tr><th colspan="2">Protected Functions and Procedures</th></tr>
+
+  <tr>
+<td><pre>
+virtual void draw();
+</pre></td>
+<td><pre>
+procedure Draw
+       (This : in out File_Input);
+</pre></td>
+  </tr>
+
+</table>
+
+
   </body>
 </html>
 
+
diff --git a/doc/fl_float_input.html b/doc/fl_float_input.html
index 7e706ae..b43f0b2 100644
--- a/doc/fl_float_input.html
+++ b/doc/fl_float_input.html
@@ -21,7 +21,7 @@
 
   <tr>
     <td>Fl_Float_Input</td>
-    <td>FLTK.Widgets.Inputs.Floating_Point</td>
+    <td>FLTK.Widgets.Inputs.Text.Floating_Point</td>
   </tr>
 
 </table>
@@ -46,7 +46,7 @@
 
 
 <table class="function">
-  <tr><th colspan="2">Functions and Procedures</th></tr>
+  <tr><th colspan="2">Constructors</th></tr>
 
   <tr>
 <td><pre>
@@ -60,16 +60,15 @@ function Create
 </pre></td>
   </tr>
 
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-procedure Draw
-       (This : in out Float_Input);
-</pre></td>
-  </tr>
+</table>
+
+
+
+<table class="function">
+  <tr><th colspan="2">Functions and Procedures</th></tr>
 
   <tr>
-<td>&nbsp;</td>
+<td>Use value() and manually convert from char * to float.</td>
 <td><pre>
 function Get_Value
        (This : in Float_Input)
@@ -77,16 +76,6 @@ function Get_Value
 </pre></td>
   </tr>
 
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-function Handle
-       (This  : in out Float_Input;
-        Event : in     Event_Kind)
-    return Event_Outcome;
-</pre></td>
-  </tr>
-
 </table>
 
 
diff --git a/doc/fl_input.html b/doc/fl_input.html
index 09c6eb1..cd0e6ca 100644
--- a/doc/fl_input.html
+++ b/doc/fl_input.html
@@ -20,8 +20,8 @@
   <tr><th colspan="2">Package name</th></tr>
 
   <tr>
-    <td>Fl_Input_<br>Fl_Input</td>
-    <td>FLTK.Widgets.Inputs</td>
+    <td>Fl_Input</td>
+    <td>FLTK.Widgets.Inputs.Text</td>
   </tr>
 
 </table>
@@ -32,18 +32,13 @@
   <tr><th colspan="2">Types</th></tr>
 
   <tr>
-    <td>Fl_Input_<br>Fl_Input</td>
-    <td>Input</td>
+    <td>Fl_Input</td>
+    <td>Text_Input</td>
   </tr>
 
   <tr>
     <td>&nbsp;</td>
-    <td>Input_Reference</td>
-  </tr>
-
-  <tr>
-    <td>&nbsp;</td>
-    <td>Input_Kind</td>
+    <td>Text_Input_Reference</td>
   </tr>
 
 </table>
@@ -51,121 +46,26 @@
 
 
 <table class="function">
-  <tr><th colspan="2">Functions and Procedures</th></tr>
+  <tr><th colspan="2">Constructors</th></tr>
 
   <tr>
 <td><pre>
-Fl_Input_(int, int, int, int, const char*=0);
-Fl_Input(int, int, int, int, const char*=0);
+Fl_Input(int, int, int, int, const char *=0);
 </pre></td>
 <td><pre>
 function Create
        (X, Y, W, H : in Integer;
-        Text       : in String)
-    return Input;
-</pre></td>
-  </tr>
-
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-function Has_Changed
-       (This : in Input)
-    return Boolean;
-</pre></td>
-  </tr>
-
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-procedure Clear_Changed
-       (This : in out Input);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int copy(int clipboard);
-</pre></td>
-<td><pre>
-procedure Copy
-       (This : in out Input);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int copy_cuts();
-</pre></td>
-<td><pre>
-procedure Copy_Cuts
-       (This : in out Input);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-Fl_Color cursor_color() const;
-</pre></td>
-<td><pre>
-function Get_Cursor_Color
-       (This : in Input)
-    return Color;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-void cursor_color(Fl_Color n);
-</pre></td>
-<td><pre>
-procedure Set_Cursor_Color
-       (This : in out Input;
-        To   : in     Color);
+        Text       : in String := "")
+    return Text_Input;
 </pre></td>
   </tr>
 
-  <tr>
-<td><pre>
-int cut();
-</pre></td>
-<td><pre>
-procedure Cut
-       (This : in out Input);
-</pre></td>
-  </tr>
+</table>
 
-  <tr>
-<td><pre>
-int cut(int n);
-</pre></td>
-<td><pre>
-procedure Cut
-       (This      : in out Input;
-        Num_Bytes : in     Integer);
-</pre></td>
-  </tr>
 
-  <tr>
-<td><pre>
-int cut(int a, int b);
-</pre></td>
-<td><pre>
-procedure Cut
-       (This          : in out Input;
-        Start, Finish : in     Integer);
-</pre></td>
-  </tr>
 
-  <tr>
-<td><pre>
-void draw();
-</pre></td>
-<td><pre>
-procedure Draw
-       (This : in out Input);
-</pre></td>
-  </tr>
+<table class="function">
+  <tr><th colspan="2">Functions and Procedures</th></tr>
 
   <tr>
 <td><pre>
@@ -173,369 +73,26 @@ int handle(int);
 </pre></td>
 <td><pre>
 function Handle
-       (This  : in out Input;
+       (This  : in out Text_Input;
         Event : in     Event_Kind)
     return Event_Outcome;
 </pre></td>
   </tr>
 
-  <tr>
-<td><pre>
-Fl_Char index(int i) const;
-</pre></td>
-<td><pre>
-function Index
-       (This  : in Input;
-        Place : in Integer)
-    return Character;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int input_type() const;
-</pre></td>
-<td><pre>
-function Get_Input_Type
-       (This : in Input)
-    return Input_Kind;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-void input_type(int t);
-</pre></td>
-<td><pre>
-procedure Set_Input_Type
-       (This : in out Input;
-        To   : in     Input_Kind);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int insert(const char *t, int l=0);
-</pre></td>
-<td><pre>
-procedure Insert
-       (This : in out Input;
-        Str  : in     String);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int mark() const;
-</pre></td>
-<td><pre>
-function Get_Mark
-       (This : in Input)
-    return Natural;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int mark(int m);
-</pre></td>
-<td><pre>
-procedure Set_Mark
-       (This : in out Input;
-        To   : in     Natural);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int maximum_size() const;
-</pre></td>
-<td><pre>
-function Get_Maximum_Size
-       (This : in Input)
-    return Natural;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-void maximum_size(int m);
-</pre></td>
-<td><pre>
-procedure Set_Maximum_Size
-       (This : in out Input;
-        To   : in     Natural);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int position() const;
-</pre></td>
-<td><pre>
-function Get_Position
-       (This : in Input)
-    return Natural;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int position(int p, int m);
-</pre></td>
-<td>&nbsp;</td>
-  </tr>
-
-  <tr>
-<td><pre>
-int position(int p);
-</pre></td>
-<td><pre>
-procedure Set_Position
-       (This : in out Input;
-        To   : in     Natural);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int readonly() const;
-</pre></td>
-<td><pre>
-function Is_Readonly
-       (This : in Input)
-    return Boolean;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-void readonly(int b);
-</pre></td>
-<td><pre>
-procedure Set_Readonly
-       (This : in out Input;
-        To   : in     Boolean);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int replace(int b, int e, const char *text, int ilen=0);
-</pre></td>
-<td><pre>
-procedure Replace
-       (This     : in out Input;
-        From, To : in     Natural;
-        New_Text : in     String);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-void resize(int, int, int, int);
-</pre></td>
-<td>&nbsp;</td>
-  </tr>
-
-  <tr>
-<td><pre>
-int shortcut() const;
-</pre></td>
-<td><pre>
-function Get_Shortcut_Key
-       (This : in Input)
-    return Shortcut_Key;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-void shortcut(int s);
-</pre></td>
-<td><pre>
-procedure Set_Shortcut_Key
-       (This : in out Input;
-        To   : in     Shortcut_Key);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int size() const;
-</pre></td>
-<td><pre>
-function Size
-       (This : in Input)
-    return Natural;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-void size(int W, int H);
-</pre></td>
-<td><pre>
-procedure Resize
-       (This : in out Input;
-        W, H : in     Integer);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int static_value(const char *);
-</pre></td>
-<td>&nbsp;</td>
-  </tr>
-
-  <tr>
-<td><pre>
-int static_value(const char *, int);
-</pre></td>
-<td>&nbsp;</td>
-  </tr>
-
-  <tr>
-<td><pre>
-void tab_nav(int val);
-</pre></td>
-<td><pre>
-procedure Set_Tab_Nav
-       (This : in out Input;
-        To   : in     Boolean);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int tab_nav() const;
-</pre></td>
-<td><pre>
-function Is_Tab_Nav
-       (This : in Input)
-    return Boolean;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-Fl_Color textcolor() const;
-</pre></td>
-<td><pre>
-function Get_Text_Color
-       (This : in Input)
-    return Color;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-void textcolor(Fl_Color n);
-</pre></td>
-<td><pre>
-procedure Set_Text_Color
-       (This : in out Input;
-        To   : in     Color);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-Fl_Font textfont() const;
-</pre></td>
-<td><pre>
-function Get_Text_Font
-       (This : in Input)
-    return Font_Kind;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-void textfont(Fl_Font s);
-</pre></td>
-<td><pre>
-procedure Set_Text_Font
-       (This : in out Input;
-        To   : in     Font_Kind);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-Fl_Fontsize textsize() const;
-</pre></td>
-<td><pre>
-function Get_Text_Size
-       (This : in Input)
-    return Font_Size;
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-void textsize(Fl_Fontsize s);
-</pre></td>
-<td><pre>
-procedure Set_Text_Size
-       (This : in out Input;
-        To   : in     Font_Size);
-</pre></td>
-  </tr>
-
-  <tr>
-<td><pre>
-int undo();
-</pre></td>
-<td><pre>
-procedure Undo
-       (This : in out Input);
-</pre></td>
-  </tr>
+</table>
 
-  <tr>
-<td><pre>
-int value(const char *);
-int value(const char *, int);
-</pre></td>
-<td><pre>
-procedure Set_Value
-       (This : in out Input;
-        To   : in     String);
-</pre></td>
-  </tr>
 
-  <tr>
-<td><pre>
-const char * value() const;
-</pre></td>
-<td><pre>
-function Get_Value
-       (This : in Input)
-    return String;
-</pre></td>
-  </tr>
 
-  <tr>
-<td><pre>
-int wrap() const;
-</pre></td>
-<td><pre>
-function Is_Wrap
-       (This : in Input)
-    return Boolean;
-</pre></td>
-  </tr>
+<table class="function">
+  <tr><th colspan="2">Protected Functions and Procedures</th></tr>
 
   <tr>
 <td><pre>
-void wrap(int b);
+void draw();
 </pre></td>
 <td><pre>
-procedure Set_Wrap
-       (This : in out Input;
-        To   : in     Boolean);
+procedure Draw
+       (This : in out Text_Input);
 </pre></td>
   </tr>
 
diff --git a/doc/fl_input_.html b/doc/fl_input_.html
new file mode 100644
index 0000000..582f0c6
--- /dev/null
+++ b/doc/fl_input_.html
@@ -0,0 +1,590 @@
+<!DOCTYPE html>
+
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Fl_Input_ Binding Map</title>
+    <link href="map.css" rel="stylesheet">
+  </head>
+
+  <body>
+
+
+<h2>Fl_Input_ Binding Map</h2>
+
+
+<a href="index.html">Back to Index</a>
+
+
+<table class="package">
+  <tr><th colspan="2">Package name</th></tr>
+
+  <tr>
+    <td>Fl_Input_</td>
+    <td>FLTK.Widgets.Inputs</td>
+  </tr>
+
+</table>
+
+<p><b>Note:</b><br /><br />
+This Input type should really be abstract but cannot be for technical binding reasons.
+If you try to use it directly you will get issues with the draw and handle methods.
+Either extend it and override those subprograms or use types already extended from it.</p>
+
+
+
+<table class="type">
+  <tr><th colspan="2">Types</th></tr>
+
+  <tr>
+    <td>Fl_Input_</td>
+    <td>Input</td>
+  </tr>
+
+  <tr>
+    <td>&nbsp;</td>
+    <td>Input_Reference</td>
+  </tr>
+
+  <tr>
+    <td>int</td>
+    <td>Input_Kind</td>
+  </tr>
+
+  <tr>
+    <td>int</td>
+    <td>Clipboard_Kind</td>
+  </tr>
+
+</table>
+
+
+
+<table class="function">
+  <tr><th colspan="2">Constructors</th></tr>
+
+  <tr>
+<td><pre>
+Fl_Input_(int, int, int, int, const char*=0);
+</pre></td>
+<td><pre>
+function Create
+       (X, Y, W, H : in Integer;
+        Text       : in String)
+    return Input;
+</pre></td>
+  </tr>
+
+</table>
+
+
+
+<table class="function">
+  <tr><th colspan="2">Functions and Procedures</th></tr>
+
+  <tr>
+<td><pre>
+int copy(int clipboard);
+</pre></td>
+<td><pre>
+procedure Copy
+       (This        : in out Input;
+        Destination : in     Clipboard_Kind := Cut_Paste_Board);
+
+function Copy
+       (This        : in out Input;
+        Destination : in     Clipboard_Kind := Cut_Paste_Board)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int copy_cuts();
+</pre></td>
+<td><pre>
+procedure Copy_Cuts
+       (This : in out Input);
+
+function Copy_Cuts
+       (This : in out Input)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+Fl_Color cursor_color() const;
+</pre></td>
+<td><pre>
+function Get_Cursor_Color
+       (This : in Input)
+    return Color;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void cursor_color(Fl_Color n);
+</pre></td>
+<td><pre>
+procedure Set_Cursor_Color
+       (This : in out Input;
+        To   : in     Color);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int cut();
+</pre></td>
+<td><pre>
+procedure Cut
+       (This : in out Input);
+
+function Cut
+       (This : in out Input)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int cut(int n);
+</pre></td>
+<td><pre>
+procedure Cut
+       (This      : in out Input;
+        Num_Bytes : in     Integer);
+
+function Cut
+       (This      : in out Input;
+        Num_Bytes : in     Integer)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int cut(int a, int b);
+</pre></td>
+<td><pre>
+procedure Cut
+       (This          : in out Input;
+        Start, Finish : in     Integer);
+
+function Cut
+       (This          : in out Input;
+        Start, Finish : in     Integer)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+Fl_Char index(int i) const;
+</pre></td>
+<td><pre>
+function Index
+       (This  : in Input;
+        Place : in Integer)
+    return Character;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int input_type() const;
+</pre></td>
+<td><pre>
+function Get_Input_Type
+       (This : in Input)
+    return Input_Kind;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void input_type(int t);
+</pre></td>
+<td><pre>
+procedure Set_Input_Type
+       (This : in out Input;
+        To   : in     Input_Kind);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int insert(const char *t, int l=0);
+</pre></td>
+<td><pre>
+procedure Insert
+       (This : in out Input;
+        Str  : in     String);
+
+function Insert
+       (This : in out Input;
+        Str  : in     String)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int mark() const;
+</pre></td>
+<td><pre>
+function Get_Mark
+       (This : in Input)
+    return Natural;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int mark(int m);
+</pre></td>
+<td><pre>
+procedure Set_Mark
+       (This : in out Input;
+        To   : in     Natural);
+
+function Set_Mark
+       (This : in out Input;
+        To   : in     Natural)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int maximum_size() const;
+</pre></td>
+<td><pre>
+function Get_Maximum_Size
+       (This : in Input)
+    return Natural;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void maximum_size(int m);
+</pre></td>
+<td><pre>
+procedure Set_Maximum_Size
+       (This : in out Input;
+        To   : in     Natural);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int position() const;
+</pre></td>
+<td><pre>
+function Get_Position
+       (This : in Input)
+    return Natural;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int position(int p, int m);
+</pre></td>
+<td><pre>
+procedure Set_Position_Mark
+       (This  : in out Input;
+        Place : in     Natural;
+        Mark  : in     Natural);
+
+function Set_Position_Mark
+       (This  : in out Input;
+        Place : in     Natural;
+        Mark  : in     Natural)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int position(int p);
+</pre></td>
+<td><pre>
+procedure Set_Position
+       (This : in out Input;
+        To   : in     Natural);
+
+function Set_Position
+       (This : in out Input;
+        To   : in     Natural)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int readonly() const;
+</pre></td>
+<td><pre>
+function Is_Readonly
+       (This : in Input)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void readonly(int b);
+</pre></td>
+<td><pre>
+procedure Set_Readonly
+       (This : in out Input;
+        To   : in     Boolean);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int replace(int b, int e, const char *text, int ilen=0);
+</pre></td>
+<td><pre>
+procedure Replace
+       (This     : in out Input;
+        From, To : in     Natural;
+        New_Text : in     String);
+
+function Replace
+       (This     : in out Input;
+        From, To : in     Natural;
+        New_Text : in     String)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void resize(int, int, int, int);
+</pre></td>
+<td><pre>
+procedure Resize
+       (This       : in out Input;
+        X, Y, W, H : in     Integer);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int shortcut() const;
+</pre></td>
+<td><pre>
+function Get_Shortcut_Key
+       (This : in Input)
+    return Shortcut_Key;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void shortcut(int s);
+</pre></td>
+<td><pre>
+procedure Set_Shortcut_Key
+       (This : in out Input;
+        To   : in     Shortcut_Key);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int size() const;
+</pre></td>
+<td><pre>
+function Size
+       (This : in Input)
+    return Natural;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void size(int W, int H);
+</pre></td>
+<td><pre>
+procedure Resize
+       (This : in out Input;
+        W, H : in     Integer);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int static_value(const char *);
+
+int static_value(const char *, int);
+</pre></td>
+<td>Due to the marshalling between String and char * there is no point
+to binding these methods. Use value / Set_Value instead.</td>
+  </tr>
+
+  <tr>
+<td><pre>
+void tab_nav(int val);
+</pre></td>
+<td><pre>
+procedure Set_Tab_Nav
+       (This : in out Input;
+        To   : in     Boolean);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int tab_nav() const;
+</pre></td>
+<td><pre>
+function Is_Tab_Nav
+       (This : in Input)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+Fl_Color textcolor() const;
+</pre></td>
+<td><pre>
+function Get_Text_Color
+       (This : in Input)
+    return Color;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void textcolor(Fl_Color n);
+</pre></td>
+<td><pre>
+procedure Set_Text_Color
+       (This : in out Input;
+        To   : in     Color);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+Fl_Font textfont() const;
+</pre></td>
+<td><pre>
+function Get_Text_Font
+       (This : in Input)
+    return Font_Kind;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void textfont(Fl_Font s);
+</pre></td>
+<td><pre>
+procedure Set_Text_Font
+       (This : in out Input;
+        To   : in     Font_Kind);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+Fl_Fontsize textsize() const;
+</pre></td>
+<td><pre>
+function Get_Text_Size
+       (This : in Input)
+    return Font_Size;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void textsize(Fl_Fontsize s);
+</pre></td>
+<td><pre>
+procedure Set_Text_Size
+       (This : in out Input;
+        To   : in     Font_Size);
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int undo();
+</pre></td>
+<td><pre>
+procedure Undo
+       (This : in out Input);
+
+function Undo
+       (This : in out Input)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int value(const char *);
+
+int value(const char *, int);
+</pre></td>
+<td><pre>
+procedure Set_Value
+       (This : in out Input;
+        To   : in     String);
+
+function Set_Value
+       (This : in out Input;
+        To   : in     String)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+const char * value() const;
+</pre></td>
+<td><pre>
+function Get_Value
+       (This : in Input)
+    return String;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+int wrap() const;
+</pre></td>
+<td><pre>
+function Is_Wrap
+       (This : in Input)
+    return Boolean;
+</pre></td>
+  </tr>
+
+  <tr>
+<td><pre>
+void wrap(int b);
+</pre></td>
+<td><pre>
+procedure Set_Wrap
+       (This : in out Input;
+        To   : in     Boolean);
+</pre></td>
+  </tr>
+
+</table>
+
+
+  </body>
+</html>
+
diff --git a/doc/fl_int_input.html b/doc/fl_int_input.html
index d340e77..fa9b9c9 100644
--- a/doc/fl_int_input.html
+++ b/doc/fl_int_input.html
@@ -21,7 +21,7 @@
 
   <tr>
     <td>Fl_Int_Input</td>
-    <td>FLTK.Widgets.Inputs.Whole_Number</td>
+    <td>FLTK.Widgets.Inputs.Text.Whole_Number</td>
   </tr>
 
 </table>
@@ -46,7 +46,7 @@
 
 
 <table class="function">
-  <tr><th colspan="2">Functions and Procedures</th></tr>
+  <tr><th colspan="2">Constructors</th></tr>
 
   <tr>
 <td><pre>
@@ -60,16 +60,15 @@ function Create
 </pre></td>
   </tr>
 
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-procedure Draw
-       (This : in out Integer_Input);
-</pre></td>
-  </tr>
+</table>
+
+
+
+<table class="function">
+  <tr><th colspan="2">Functions and Procedures</th></tr>
 
   <tr>
-<td>&nbsp;</td>
+<td>Use value() and manually convert from char * to int.</td>
 <td><pre>
 function Get_Value
        (This : in Integer_Input)
@@ -77,16 +76,6 @@ function Get_Value
 </pre></td>
   </tr>
 
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-function Handle
-       (This  : in out Integer_Input;
-        Event : in     Event_Kind)
-    return Event_Outcome;
-</pre></td>
-  </tr>
-
 </table>
 
 
diff --git a/doc/fl_multiline_input.html b/doc/fl_multiline_input.html
index d4acb1b..25067e6 100644
--- a/doc/fl_multiline_input.html
+++ b/doc/fl_multiline_input.html
@@ -21,7 +21,7 @@
 
   <tr>
     <td>Fl_Multiline_Input</td>
-    <td>FLTK.Widgets.Inputs.Multiline</td>
+    <td>FLTK.Widgets.Inputs.Text.Multiline</td>
   </tr>
 
 </table>
@@ -46,7 +46,7 @@
 
 
 <table class="function">
-  <tr><th colspan="2">Functions and Procedures</th></tr>
+  <tr><th colspan="2">Constructors</th></tr>
 
   <tr>
 <td><pre>
@@ -60,24 +60,6 @@ function Create
 </pre></td>
   </tr>
 
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-procedure Draw
-       (This : in out Multiline_Input);
-</pre></td>
-  </tr>
-
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-function Handle
-       (This  : in out Multiline_Input;
-        Event : in     Event_Kind)
-    return Event_Outcome;
-</pre></td>
-  </tr>
-
 </table>
 
 
diff --git a/doc/fl_multiline_output.html b/doc/fl_multiline_output.html
index bce9814..e4fa771 100644
--- a/doc/fl_multiline_output.html
+++ b/doc/fl_multiline_output.html
@@ -21,7 +21,7 @@
 
   <tr>
     <td>Fl_Multiline_Output</td>
-    <td>FLTK.Widgets.Inputs.Outputs.Multiline</td>
+    <td>FLTK.Widgets.Inputs.Text.Outputs.Multiline</td>
   </tr>
 
 </table>
@@ -46,7 +46,7 @@
 
 
 <table class="function">
-  <tr><th colspan="2">Functions and Procedures</th></tr>
+  <tr><th colspan="2">Constructors</th></tr>
 
   <tr>
 <td><pre>
@@ -60,24 +60,6 @@ function Create
 </pre></td>
   </tr>
 
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-procedure Draw
-       (This : in out Multiline_Output);
-</pre></td>
-  </tr>
-
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-function Handle
-       (This  : in out Multiline_Output;
-        Event : in     Event_Kind)
-    return Event_Outcome;
-</pre></td>
-  </tr>
-
 </table>
 
 
diff --git a/doc/fl_output.html b/doc/fl_output.html
index c8de10c..2af1279 100644
--- a/doc/fl_output.html
+++ b/doc/fl_output.html
@@ -21,7 +21,7 @@
 
   <tr>
     <td>Fl_Output</td>
-    <td>FLTK.Widgets.Inputs.Outputs</td>
+    <td>FLTK.Widgets.Inputs.Text.Outputs</td>
   </tr>
 
 </table>
@@ -46,7 +46,7 @@
 
 
 <table class="function">
-  <tr><th colspan="2">Functions and Procedures</th></tr>
+  <tr><th colspan="2">Constructors</th></tr>
 
   <tr>
 <td><pre>
@@ -60,24 +60,6 @@ function Create
 </pre></td>
   </tr>
 
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-procedure Draw
-       (This : in out Output);
-</pre></td>
-  </tr>
-
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-function Handle
-       (This  : in out Output;
-        Event : in     Event_Kind)
-    return Event_Outcome;
-</pre></td>
-  </tr>
-
 </table>
 
 
diff --git a/doc/fl_secret_input.html b/doc/fl_secret_input.html
index 31d3f41..79e8eaf 100644
--- a/doc/fl_secret_input.html
+++ b/doc/fl_secret_input.html
@@ -21,7 +21,7 @@
 
   <tr>
     <td>Fl_Secret_Input</td>
-    <td>FLTK.Widgets.Inputs.Secret</td>
+    <td>FLTK.Widgets.Inputs.Text.Secret</td>
   </tr>
 
 </table>
@@ -46,7 +46,7 @@
 
 
 <table class="function">
-  <tr><th colspan="2">Functions and Procedures</th></tr>
+  <tr><th colspan="2">Constructors</th></tr>
 
   <tr>
 <td><pre>
@@ -60,13 +60,12 @@ function Create
 </pre></td>
   </tr>
 
-  <tr>
-<td>&nbsp;</td>
-<td><pre>
-procedure Draw
-       (This : in out Secret_Input);
-</pre></td>
-  </tr>
+</table>
+
+
+
+<table class="function">
+  <tr><th colspan="2">Functions and Procedures</th></tr>
 
   <tr>
 <td><pre>
diff --git a/doc/fl_widget.html b/doc/fl_widget.html
index ea362e6..a5e0e7c 100644
--- a/doc/fl_widget.html
+++ b/doc/fl_widget.html
@@ -56,7 +56,7 @@
 
 
 <table class="function">
-  <tr><th colspan="2">Functions and Procedures</th></tr>
+  <tr><th colspan="2">Constructors</th></tr>
 
   <tr>
 <td><pre>
@@ -70,6 +70,13 @@ function Create
 </pre></td>
   </tr>
 
+</table>
+
+
+
+<table class="function">
+  <tr><th colspan="2">Functions and Procedures</th></tr>
+
   <tr>
 <td><pre>
 void _clear_fullscreen();
@@ -487,7 +494,7 @@ virtual void draw()=0;
 </pre></td>
 <td><pre>
 procedure Draw
-       (This : in out Widget) is null;
+       (This : in out Widget);
 </pre></td>
   </tr>
 
diff --git a/doc/index.html b/doc/index.html
index bb02df6..d181682 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -65,7 +65,7 @@
   <li><a href="fl_image.html">Fl_Image</a></li>
   <li><a href="fl_image_surface.html">Fl_Image_Surface</a></li>
   <li><a href="fl_input.html">Fl_Input</a></li>
-  <li><a href="fl_input.html">Fl_Input_</a></li>
+  <li><a href="fl_input_.html">Fl_Input_</a></li>
   <li><a href="fl_input_choice.html">Fl_Input_Choice</a></li>
   <li><a href="fl_int_input.html">Fl_Int_Input</a></li>
   <li><a href="fl_jpeg_image.html">Fl_JPEG_Image</a></li>
@@ -220,14 +220,15 @@
   <li><a href="fl_single_window.html">FLTK.Widgets.Groups.Windows.Single</a></li>
   <li><a href="fl_menu_window.html">FLTK.Widgets.Groups.Windows.Single.Menu</a></li>
   <li><a href="fl_wizard.html">FLTK.Widgets.Groups.Wizards</a></li>
-  <li><a href="fl_input.html">FLTK.Widgets.Inputs</a></li>
-  <li><a href="fl_file_input.html">FLTK.Widgets.Inputs.File</a></li>
-  <li><a href="fl_float_input.html">FLTK.Widgets.Inputs.Floating_Point</a></li>
-  <li><a href="fl_multiline_input.html">FLTK.Widgets.Inputs.Multiline</a></li>
-  <li><a href="fl_output.html">FLTK.Widgets.Inputs.Outputs</a></li>
-  <li><a href="fl_multiline_output.html">FLTK.Widgets.Inputs.Outputs.Multiline</a></li>
-  <li><a href="fl_secret_input.html">FLTK.Widgets.Inputs.Secret</a></li>
-  <li><a href="fl_int_input.html">FLTK.Widgets.Inputs.Whole_Number</a></li>
+  <li><a href="fl_input_.html">FLTK.Widgets.Inputs</a></li>
+  <li><a href="fl_input.html">FLTK.Widgets.Inputs.Text</a></li>
+  <li><a href="fl_file_input.html">FLTK.Widgets.Inputs.Text.File</a></li>
+  <li><a href="fl_float_input.html">FLTK.Widgets.Inputs.Text.Floating_Point</a></li>
+  <li><a href="fl_multiline_input.html">FLTK.Widgets.Inputs.Text.Multiline</a></li>
+  <li><a href="fl_output.html">FLTK.Widgets.Inputs.Text.Outputs</a></li>
+  <li><a href="fl_multiline_output.html">FLTK.Widgets.Inputs.Text.Outputs.Multiline</a></li>
+  <li><a href="fl_secret_input.html">FLTK.Widgets.Inputs.Text.Secret</a></li>
+  <li><a href="fl_int_input.html">FLTK.Widgets.Inputs.Text.Whole_Number</a></li>
   <li><a href="fl_menu_.html">FLTK.Widgets.Menus</a></li>
   <li><a href="fl_choice.html">FLTK.Widgets.Menus.Choices</a></li>
   <li><a href="fl_menu_bar.html">FLTK.Widgets.Menus.Menu_Bars</a></li>