#860: FLUID: Removes Group attributes from Fl_Terminal

4 files changed, 7 insertions, 9 deletions

diff --git a/fluid/Fl_Type.cxx b/fluid/Fl_Type.cxx
index fde837a0e..e1b184327 100644
--- a/fluid/Fl_Type.cxx
+++ b/fluid/Fl_Type.cxx
@@ -58,7 +58,8 @@
           +-+ Fl_Input_Type
           | +-- Fl_Output_Type
           +-+ Fl_Text_Display_Type
-          | +-- Fl_Text_Editor+Type
+          | +-- Fl_Text_Editor_Type
+          +-- Fl_Terminal_Type
           +-- Fl_Box_Type
           +-- Fl_Clock_Type
           +-- Fl_Progress_Type
@@ -70,7 +71,6 @@
           | +-- Fl_Table_Type
           | +-- Fl_Tabs_Type
           | +-- Fl_Scroll_Type
-          | +-- Fl_Terminal_Type
           | +-- Fl_Tile_Type
           | +-- Fl_Wizard_Type
           | +-+ Fl_Window_Type
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index aa8bd228a..72c5a56a4 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -3050,9 +3050,8 @@ Fl_Double_Window* make_shell_window() {
   { shell_run_window = new Fl_Double_Window(555, 430, "Shell Command Output");
     shell_run_window->align(Fl_Align(FL_ALIGN_CLIP|FL_ALIGN_INSIDE));
     { shell_run_terminal = new Fl_Terminal(10, 10, 535, 375);
-      shell_run_terminal->ansi(1);
-      shell_run_terminal->end();
       Fl_Group::current()->resizable(shell_run_terminal);
+      shell_run_terminal->ansi(1);
     } // Fl_Terminal* shell_run_terminal
     { Fl_Group* o = new Fl_Group(10, 395, 535, 25);
       { Fl_Button* o = new Fl_Button(10, 395, 94, 25, "Clear");
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 95759d4a7..69e73da65 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -1577,13 +1577,13 @@ Function {make_shell_window()} {open
     Fl_Terminal shell_run_terminal {
       xywh {10 10 535 375} resizable
       code0 {shell_run_terminal->ansi(1);}
-    } {}
+    }
     Fl_Group {} {open
       xywh {10 395 535 25}
     } {
       Fl_Button {} {
         label Clear
-        callback {shell_run_terminal->append("\\e[2J\\e[H");} selected
+        callback {shell_run_terminal->append("\\033[2J\\033[H");} selected
         xywh {10 395 94 25}
       }
       Fl_Box {} {
diff --git a/fluid/factory.cxx b/fluid/factory.cxx
index 59a358bce..46183bb8a 100644
--- a/fluid/factory.cxx
+++ b/fluid/factory.cxx
@@ -889,9 +889,9 @@ public:
 /**
  \brief Manage a terminal widget.
  */
-class Fl_Terminal_Type : public Fl_Group_Type
+class Fl_Terminal_Type : public Fl_Widget_Type
 {
-  typedef Fl_Group_Type super;
+  typedef Fl_Widget_Type super;
 public:
   const char *type_name() FL_OVERRIDE { return "Fl_Terminal"; }
   // Older .fl files with Fl_Simple_Terminal will create a Fl_Terminal instead.
@@ -929,7 +929,6 @@ public:
     return 1;
   }
   Fl_Widget_Type *_make() FL_OVERRIDE {return new Fl_Terminal_Type();}
-  int is_parent() const FL_OVERRIDE { return 0; }
   ID id() const FL_OVERRIDE { return ID_Terminal; }
   bool is_a(ID inID) const FL_OVERRIDE { return (inID==ID_Terminal) ? true : super::is_a(inID); }
 };