Add new widgets to FLUID.

Add on-line help to FLUID.

Change ALT shortcuts to CTRL shortcuts.

Update config script to set documentation directory in config.h.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1572 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

9 files changed, 328 insertions, 90 deletions

diff --git a/CHANGES b/CHANGES
index 191e49314..c51de008d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,8 +20,6 @@ CHANGES IN FLTK 1.1.0
 	  Fl_HelpView, Fl_Progress, and Fl_Wizard widgets from
 	  the bazaar.
 
-TODO	- Added the Fl_Tree_Browser widgets from the bazaar.
-
 	- Added 2.0 Fl_Text_Display and Fl_Text_Editor widgets
 	  based on NEdit.
 
@@ -37,10 +35,15 @@ TODO	- Colors are now 32 bits in FLTK, allowing the use and
 	  selection of 24-bit RGB values or 8-bit FLTK indexed
 	  colors.
 
-TODO	- FLUID now supports the new Fl_CheckBrowser,
+	- FLUID now supports the new Fl_CheckBrowser,
 	  Fl_FileBrowser, Fl_FileIcon, Fl_HelpView,
-	  Fl_Text_Display, Fl_Text_Editor, Fl_Tree_Browser, and
-	  Fl_Wizard widgets.
+	  Fl_Text_Display, Fl_Text_Editor, and Fl_Wizard
+	  widgets.
+
+TODO	- FLUID now provides on-line help.
+
+TODO	- FLUID now supports image labels in addition to text
+	  labels + text over image alignment.
 
 TODO	- Documentation updates.
 
diff --git a/configh.in b/configh.in
index 0785b6ebe..3a4db9370 100644
--- a/configh.in
+++ b/configh.in
@@ -1,5 +1,5 @@
 /*
- * "$Id: configh.in,v 1.11.2.11.2.1 2001/08/02 19:43:49 easysw Exp $"
+ * "$Id: configh.in,v 1.11.2.11.2.2 2001/08/11 16:09:25 easysw Exp $"
  *
  * Configuration file for the Fast Light Tool Kit (FLTK).
  * @configure_input@
@@ -25,6 +25,13 @@
  */
 
 /*
+ * Where to find the documentation files...
+ */
+
+#define FLTK_DOCDIR	""
+
+
+/*
  * BORDER_WIDTH:
  *
  * Thickness of FL_UP_BOX and FL_DOWN_BOX.  Current 1,2, and 3 are
@@ -192,5 +199,5 @@
 
 
 /*
- * End of "$Id: configh.in,v 1.11.2.11.2.1 2001/08/02 19:43:49 easysw Exp $".
+ * End of "$Id: configh.in,v 1.11.2.11.2.2 2001/08/11 16:09:25 easysw Exp $".
  */
diff --git a/configure.in b/configure.in
index ae9bbe289..606a47a97 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl -*- sh -*-
 dnl the "configure" script is made from this by running GNU "autoconf"
 dnl
-dnl "$Id: configure.in,v 1.33.2.31.2.6 2001/08/08 12:47:59 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.7 2001/08/11 16:09:26 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -435,9 +435,15 @@ AC_SUBST(LINKFLTKGL)
 AC_SUBST(LINKFLTK)
 AC_SUBST(MAKEDEPEND)
 
+if test x$prefix = xNONE; then
+	AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "/usr/local/share/doc/fltk")
+else
+	AC_DEFINE_UNQUOTED(FLTK_DOCDIR, "$prefix/share/doc/fltk")
+fi
+
 AC_CONFIG_HEADER(config.h:configh.in)
 AC_OUTPUT(makeinclude)
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.6 2001/08/08 12:47:59 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.7 2001/08/11 16:09:26 easysw Exp $".
 dnl
diff --git a/fluid/Fl_Group_Type.cxx b/fluid/Fl_Group_Type.cxx
index eb7b10f4e..4b62a9a03 100644
--- a/fluid/Fl_Group_Type.cxx
+++ b/fluid/Fl_Group_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Group_Type.cxx,v 1.4.2.7 2001/01/22 15:13:38 easysw Exp $"
+// "$Id: Fl_Group_Type.cxx,v 1.4.2.7.2.1 2001/08/11 16:09:26 easysw Exp $"
 //
 // Fl_Group object code for the Fast Light Tool Kit (FLTK).
 //
@@ -165,6 +165,18 @@ Fl_Type* Fl_Tabs_Type::click_test(int x, int y) {
   return (Fl_Type*)(t->value()->user_data());
 }
 
+////////////////////////////////////////////////////////////////
+
+const char wizard_type_name[] = "Fl_Wizard";
+
+// Override group's resize behavior to do nothing to children:
+void iwizard::resize(int X, int Y, int W, int H) {
+  Fl_Widget::resize(X,Y,W,H);
+  redraw();
+}
+
+Fl_Wizard_Type Fl_Wizard_type;	// the "factory"
+
 // This is called when o is created.  If it is in the tab group make
 // sure it is visible:
 
@@ -230,5 +242,5 @@ const char tile_type_name[] = "Fl_Tile";
 Fl_Tile_Type Fl_Tile_type;	// the "factory"
 
 //
-// End of "$Id: Fl_Group_Type.cxx,v 1.4.2.7 2001/01/22 15:13:38 easysw Exp $".
+// End of "$Id: Fl_Group_Type.cxx,v 1.4.2.7.2.1 2001/08/11 16:09:26 easysw Exp $".
 //
diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h
index 96b039c77..8daac9789 100644
--- a/fluid/Fl_Type.h
+++ b/fluid/Fl_Type.h
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Type.h,v 1.5.2.11 2001/01/22 15:13:38 easysw Exp $"
+// "$Id: Fl_Type.h,v 1.5.2.11.2.1 2001/08/11 16:09:26 easysw Exp $"
 //
 // Widget type header file for the Fast Light Tool Kit (FLTK).
 //
@@ -275,6 +275,7 @@ public:
 
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Pack.H>
+#include <FL/Fl_Wizard.H>
 
 class igroup : public Fl_Group {
 public:
@@ -288,6 +289,12 @@ public:
   itabs(int x,int y,int w,int h) : Fl_Tabs(x,y,w,h) {}
 };
 
+class iwizard : public Fl_Wizard {
+public:
+  void resize(int,int,int,int);
+  iwizard(int x,int y,int w,int h) : Fl_Wizard(x,y,w,h) {}
+};
+
 class Fl_Group_Type : public Fl_Widget_Type {
 public:
   virtual const char *type_name() {return "Fl_Group";}
@@ -345,6 +352,16 @@ public:
   Fl_Widget_Type *_make() {return new Fl_Tile_Type();}
 };
 
+extern const char wizard_type_name[];
+
+class Fl_Wizard_Type : public Fl_Group_Type {
+public:
+  virtual const char *type_name() {return wizard_type_name;}
+  Fl_Widget *widget(int x,int y,int w,int h) {
+    iwizard *g = new iwizard(x,y,w,h); Fl_Group::current(0); return g;}
+  Fl_Widget_Type *_make() {return new Fl_Wizard_Type();}
+};
+
 extern Fl_Menu_Item window_type_menu[];
 
 class Fl_Window_Type : public Fl_Widget_Type {
@@ -532,5 +549,5 @@ int storestring(const char *n, const char * & p, int nostrip=0);
 extern int include_H_from_C;
 
 //
-// End of "$Id: Fl_Type.h,v 1.5.2.11 2001/01/22 15:13:38 easysw Exp $".
+// End of "$Id: Fl_Type.h,v 1.5.2.11.2.1 2001/08/11 16:09:26 easysw Exp $".
 //
diff --git a/fluid/Makefile b/fluid/Makefile
index 4025dc366..88dbd5de4 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.10.2.6.2.2 2001/08/02 18:08:36 easysw Exp $"
+# "$Id: Makefile,v 1.10.2.6.2.3 2001/08/11 16:09:26 easysw Exp $"
 #
 # Fluid makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -51,7 +51,8 @@ include ../makeinclude
 
 $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
 	echo Linking $@...
-	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTK) $(LDLIBS)
+	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTK) $(LDLIBS) \
+		$(IMAGELIBS)
 
 clean :
 	-@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend
@@ -85,5 +86,5 @@ rebuild:
 	./fluid -c widget_panel.fl
 
 #
-# End of "$Id: Makefile,v 1.10.2.6.2.2 2001/08/02 18:08:36 easysw Exp $".
+# End of "$Id: Makefile,v 1.10.2.6.2.3 2001/08/11 16:09:26 easysw Exp $".
 #
diff --git a/fluid/factory.cxx b/fluid/factory.cxx
index 33572b93c..4456c744d 100644
--- a/fluid/factory.cxx
+++ b/fluid/factory.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: factory.cxx,v 1.4.2.11 2001/04/13 19:07:40 easysw Exp $"
+// "$Id: factory.cxx,v 1.4.2.11.2.1 2001/08/11 16:09:26 easysw Exp $"
 //
 // Widget factory code for the Fast Light Tool Kit (FLTK).
 //
@@ -173,6 +173,9 @@ static Fl_Round_Button_Type Fl_Round_Button_type;
 extern int compile_only;
 
 #include <FL/Fl_Browser.H>
+#include <FL/Fl_Check_Browser.H>
+#include <FL/Fl_FileBrowser.H>
+
 static Fl_Menu_Item browser_type_menu[] = {
   {"No Select",0,0,(void*)FL_NORMAL_BROWSER},
   {"Select",0,0,(void*)FL_SELECT_BROWSER},
@@ -213,6 +216,74 @@ int Fl_Browser_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
   return 1;
 }
 
+class Fl_Check_Browser_Type : public Fl_Widget_Type {
+  Fl_Menu_Item *subtypes() {return browser_type_menu;}
+  int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c);
+public:
+  virtual const char *type_name() {return "Fl_Check_Browser";}
+  Fl_Widget *widget(int x,int y,int w,int h) {
+    Fl_Check_Browser* b = new Fl_Check_Browser(x,y,w,h);
+    // Fl_Check_Browser::add calls fl_height(), which requires the X display open.
+    // Avoid this when compiling so it works w/o a display:
+    if (!compile_only) {
+      char buffer[20];
+      for (int i = 1; i <= 20; i++) {
+	sprintf(buffer,"Browser Line %d",i);
+	b->add(buffer);
+      }
+    }
+    return b;
+  }
+  Fl_Widget_Type *_make() {return new Fl_Check_Browser_Type();}
+};
+static Fl_Check_Browser_Type Fl_Check_Browser_type;
+
+int Fl_Check_Browser_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
+  Fl_Check_Browser *myo = (Fl_Check_Browser*)(w==4 ? ((Fl_Widget_Type*)factory)->o : o);
+  switch (w) {
+    case 4:
+    case 0: f = myo->textfont(); s = myo->textsize(); c = myo->textcolor(); break;
+    case 1: myo->textfont(f); break;
+    case 2: myo->textsize(s); break;
+    case 3: myo->textcolor(c); break;
+  }
+  return 1;
+}
+
+class Fl_FileBrowser_Type : public Fl_Widget_Type {
+  Fl_Menu_Item *subtypes() {return browser_type_menu;}
+  int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c);
+public:
+  virtual const char *type_name() {return "Fl_FileBrowser";}
+  Fl_Widget *widget(int x,int y,int w,int h) {
+    Fl_FileBrowser* b = new Fl_FileBrowser(x,y,w,h);
+    // Fl_FileBrowser::add calls fl_height(), which requires the X display open.
+    // Avoid this when compiling so it works w/o a display:
+    if (!compile_only) {
+      char buffer[20];
+      for (int i = 1; i <= 20; i++) {
+	sprintf(buffer,"Browser Line %d",i);
+	b->add(buffer);
+      }
+    }
+    return b;
+  }
+  Fl_Widget_Type *_make() {return new Fl_FileBrowser_Type();}
+};
+static Fl_FileBrowser_Type Fl_FileBrowser_type;
+
+int Fl_FileBrowser_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
+  Fl_FileBrowser *myo = (Fl_FileBrowser*)(w==4 ? ((Fl_Widget_Type*)factory)->o : o);
+  switch (w) {
+    case 4:
+    case 0: f = myo->textfont(); s = myo->textsize(); c = myo->textcolor(); break;
+    case 1: myo->textfont(f); break;
+    case 2: myo->textsize(s); break;
+    case 3: myo->textcolor(c); break;
+  }
+  return 1;
+}
+
 ////////////////////////////////////////////////////////////////
 
 #include <FL/Fl_Counter.H>
@@ -282,6 +353,60 @@ int Fl_Input_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
 
 ////////////////////////////////////////////////////////////////
 
+#include <FL/Fl_Text_Display.H>
+class Fl_Text_Display_Type : public Fl_Widget_Type {
+  int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c);
+public:
+  virtual const char *type_name() {return "Fl_Text_Display";}
+  Fl_Widget *widget(int x,int y,int w,int h) {
+    Fl_Text_Display *myo = new Fl_Text_Display(x,y,w,h);
+    return myo;
+  }
+  Fl_Widget_Type *_make() {return new Fl_Text_Display_Type();}
+};
+static Fl_Text_Display_Type Fl_Text_Display_type;
+
+int Fl_Text_Display_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
+  Fl_Text_Display *myo = (Fl_Text_Display*)(w==4 ? ((Fl_Widget_Type*)factory)->o : o);
+  switch (w) {
+    case 4:
+    case 0: f = myo->textfont(); s = myo->textsize(); c = myo->textcolor(); break;
+    case 1: myo->textfont(f); break;
+    case 2: myo->textsize(s); break;
+    case 3: myo->textcolor(c); break;
+  }
+  return 1;
+}
+
+////////////////////////////////////////////////////////////////
+
+#include <FL/Fl_Text_Editor.H>
+class Fl_Text_Editor_Type : public Fl_Widget_Type {
+  int textstuff(int w, Fl_Font& f, int& s, Fl_Color& c);
+public:
+  virtual const char *type_name() {return "Fl_Text_Editor";}
+  Fl_Widget *widget(int x,int y,int w,int h) {
+    Fl_Text_Editor *myo = new Fl_Text_Editor(x,y,w,h);
+    return myo;
+  }
+  Fl_Widget_Type *_make() {return new Fl_Text_Editor_Type();}
+};
+static Fl_Text_Editor_Type Fl_Text_Editor_type;
+
+int Fl_Text_Editor_Type::textstuff(int w, Fl_Font& f, int& s, Fl_Color& c) {
+  Fl_Text_Editor *myo = (Fl_Text_Editor*)(w==4 ? ((Fl_Widget_Type*)factory)->o : o);
+  switch (w) {
+    case 4:
+    case 0: f = myo->textfont(); s = myo->textsize(); c = myo->textcolor(); break;
+    case 1: myo->textfont(f); break;
+    case 2: myo->textsize(s); break;
+    case 3: myo->textcolor(c); break;
+  }
+  return 1;
+}
+
+////////////////////////////////////////////////////////////////
+
 #include <FL/Fl_Clock.H>
 class Fl_Clock_Type : public Fl_Widget_Type {
 public:
@@ -294,6 +419,35 @@ static Fl_Clock_Type Fl_Clock_type;
 
 ////////////////////////////////////////////////////////////////
 
+#include <FL/Fl_HelpView.H>
+class Fl_HelpView_Type : public Fl_Widget_Type {
+public:
+  virtual const char *type_name() {return "Fl_HelpView";}
+  Fl_Widget *widget(int x,int y,int w,int h) {
+    Fl_HelpView *myo = new Fl_HelpView(x,y,w,h);
+    myo->value("<HTML><BODY><H1>Fl_HelpView Widget</H1>"
+               "<P>This is a Fl_HelpView widget.</P></BODY></HTML>");
+    return myo;}
+  Fl_Widget_Type *_make() {return new Fl_HelpView_Type();}
+};
+static Fl_HelpView_Type Fl_HelpView_type;
+
+////////////////////////////////////////////////////////////////
+
+#include <FL/Fl_Progress.H>
+class Fl_Progress_Type : public Fl_Widget_Type {
+public:
+  virtual const char *type_name() {return "Fl_Progress";}
+  Fl_Widget *widget(int x,int y,int w,int h) {
+    Fl_Progress *myo = new Fl_Progress(x,y,w,h);
+    myo->value(50);
+    return myo;}
+  Fl_Widget_Type *_make() {return new Fl_Progress_Type();}
+};
+static Fl_Progress_Type Fl_Progress_type;
+
+////////////////////////////////////////////////////////////////
+
 #include <FL/Fl_Adjuster.H>
 class Fl_Adjuster_Type : public Fl_Widget_Type {
   int is_valuator() const {return 1;}
@@ -498,6 +652,7 @@ extern class Fl_Menu_Bar_Type Fl_Menu_Bar_type;
 extern class Fl_Menu_Button_Type Fl_Menu_Button_type;
 extern class Fl_Menu_Item_Type Fl_Menu_Item_type;
 extern class Fl_Submenu_Type Fl_Submenu_type;
+extern class Fl_Wizard_Type Fl_Wizard_type;
 
 extern void select(Fl_Type *,int);
 extern void select_only(Fl_Type *);
@@ -523,6 +678,7 @@ Fl_Menu_Item New_Menu[] = {
   {0,0,cb,(void*)&Fl_Tabs_type},
   {0,0,cb,(void*)&Fl_Scroll_type},
   {0,0,cb,(void*)&Fl_Tile_type},
+  {0,0,cb,(void*)&Fl_Wizard_type},
 {0},
 {"buttons",0,0,0,FL_SUBMENU},
   {0,0,cb,(void*)&Fl_Button_type},
@@ -546,6 +702,8 @@ Fl_Menu_Item New_Menu[] = {
 {"text",0,0,0,FL_SUBMENU},
   {0,0,cb,(void*)&Fl_Input_type},
   {0,0,cb,(void*)&Fl_Output_type},
+  {0,0,cb,(void*)&Fl_Text_Display_type},
+  {0,0,cb,(void*)&Fl_Text_Editor_type},
 {0},
 {"menus",0,0,0,FL_SUBMENU},
   {0,0,cb,(void*)&Fl_Menu_Bar_type},
@@ -554,10 +712,16 @@ Fl_Menu_Item New_Menu[] = {
   {0,0,cb, (void*)&Fl_Submenu_type},
   {0,0,cb, (void*)&Fl_Menu_Item_type},
 {0},
-{"other",0,0,0,FL_SUBMENU},
+{"browsers",0,0,0,FL_SUBMENU},
   {0,0,cb,(void*)&Fl_Browser_type},
+  {0,0,cb,(void*)&Fl_Check_Browser_type},
+  {0,0,cb,(void*)&Fl_FileBrowser_type},
+{0},
+{"other",0,0,0,FL_SUBMENU},
   {0,0,cb,(void*)&Fl_Box_type},
   {0,0,cb,(void*)&Fl_Clock_type},
+  {0,0,cb,(void*)&Fl_HelpView_type},
+  {0,0,cb,(void*)&Fl_Progress_type},
 {0},
 {0}};
 
@@ -727,5 +891,5 @@ int lookup_symbol(const char *name, int &v, int numberok) {
 }
 
 //
-// End of "$Id: factory.cxx,v 1.4.2.11 2001/04/13 19:07:40 easysw Exp $".
+// End of "$Id: factory.cxx,v 1.4.2.11.2.1 2001/08/11 16:09:26 easysw Exp $".
 //
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index b8a69ad5b..f659f78e8 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fluid.cxx,v 1.15.2.13.2.2 2001/08/05 15:34:28 easysw Exp $"
+// "$Id: fluid.cxx,v 1.15.2.13.2.3 2001/08/11 16:09:26 easysw Exp $"
 //
 // FLUID main entry for the Fast Light Tool Kit (FLTK).
 //
@@ -24,7 +24,7 @@
 //
 
 const char *copyright =
-"The FLTK user interface designer version 1.0.11\n"
+"The FLTK user interface designer version 1.1.0\n"
 "Copyright 1998-2001 by Bill Spitzak and others.\n"
 "\n"
 "This library is free software; you can redistribute it and/or "
@@ -48,6 +48,7 @@ const char *copyright =
 #include <FL/Fl_Double_Window.H>
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Button.H>
+#include <FL/Fl_HelpDialog.H>
 #include <FL/Fl_Hold_Browser.H>
 #include <FL/Fl_Menu_Bar.H>
 #include <FL/Fl_Input.H>
@@ -61,6 +62,8 @@ const char *copyright =
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+#include <config.h>
+
 
 #if defined(WIN32) && !defined(__CYGWIN__)
 #  include <direct.h>
@@ -73,6 +76,9 @@ const char *copyright =
 
 #include "Fl_Type.h"
 
+static Fl_HelpDialog *help_dialog = 0;
+
+
 ////////////////////////////////////////////////////////////////
 
 void nyi(Fl_Widget *,void *) {
@@ -135,6 +141,11 @@ void exit_cb(Fl_Widget *,void *) {
 	  if (modflag) return;	// Didn't save!
     }
 
+  if (about_panel)
+    delete about_panel;
+  if (help_dialog)
+    delete help_dialog;
+
   exit(0);
 }
 
@@ -330,6 +341,18 @@ void about_cb(Fl_Widget *, void *) {
   about_panel->show();
 }
 
+void help_cb(Fl_Widget *, void *) {
+  if (!help_dialog) help_dialog = new Fl_HelpDialog();
+  help_dialog->load(FLTK_DOCDIR "/fluid.html");
+  help_dialog->show();
+}
+
+void manual_cb(Fl_Widget *, void *) {
+  if (!help_dialog) help_dialog = new Fl_HelpDialog();
+  help_dialog->load(FLTK_DOCDIR "/index.html");
+  help_dialog->show();
+}
+
 ////////////////////////////////////////////////////////////////
 
 extern Fl_Menu_Item New_Menu[];
@@ -337,20 +360,20 @@ extern Fl_Menu_Item New_Menu[];
 Fl_Menu_Item Main_Menu[] = {
 {"&File",0,0,0,FL_SUBMENU},
   {"New", 0, new_cb, 0},
-  {"Open...", FL_ALT+'o', open_cb, 0},
-  {"Save", FL_ALT+'s', save_cb, 0},
-  {"Save As...", FL_ALT+'S', save_cb, (void*)1},
-  {"Merge...", FL_ALT+'i', open_cb, (void*)1, FL_MENU_DIVIDER},
-  {"Write code", FL_ALT+'C', write_cb, 0},
-  {"Write strings", FL_ALT+'W', write_strings_cb, 0},
-  {"Quit", FL_ALT+'q', exit_cb},
+  {"Open...", FL_CTRL+'o', open_cb, 0},
+  {"Save", FL_CTRL+'s', save_cb, 0},
+  {"Save As...", FL_CTRL+'S', save_cb, (void*)1},
+  {"Merge...", FL_CTRL+'i', open_cb, (void*)1, FL_MENU_DIVIDER},
+  {"Write code", FL_CTRL+'C', write_cb, 0},
+  {"Write strings", FL_CTRL+'W', write_strings_cb, 0},
+  {"Quit", FL_CTRL+'q', exit_cb},
   {0},
 {"&Edit",0,0,0,FL_SUBMENU},
-  {"Undo", FL_ALT+'z', nyi},
-  {"Cut", FL_ALT+'x', cut_cb},
-  {"Copy", FL_ALT+'c', copy_cb},
-  {"Paste", FL_ALT+'v', paste_cb},
-  {"Select All", FL_ALT+'a', select_all_cb, 0, FL_MENU_DIVIDER},
+  {"Undo", FL_CTRL+'z', nyi},
+  {"Cut", FL_CTRL+'x', cut_cb},
+  {"Copy", FL_CTRL+'c', copy_cb},
+  {"Paste", FL_CTRL+'v', paste_cb},
+  {"Select All", FL_CTRL+'a', select_all_cb, 0, FL_MENU_DIVIDER},
   {"Open...", FL_F+1, openwidget_cb},
   {"Sort",0,sort_cb},
   {"Earlier", FL_F+2, earlier_cb},
@@ -361,13 +384,14 @@ Fl_Menu_Item Main_Menu[] = {
   {"Ungroup", FL_F+8, ungroup_cb,0, FL_MENU_DIVIDER},
 //{"Deactivate", 0, nyi},
 //{"Activate", 0, nyi, 0, FL_MENU_DIVIDER},
-  {"Overlays on/off",FL_ALT+'O',toggle_overlays},
-  {"Preferences",FL_ALT+'p',show_alignment_cb},
+  {"Overlays on/off",FL_CTRL+'O',toggle_overlays},
+  {"Preferences",FL_CTRL+'p',show_alignment_cb},
   {0},
 {"&New", 0, 0, (void *)New_Menu, FL_SUBMENU_POINTER},
 {"&Help",0,0,0,FL_SUBMENU},
-  {"About fluid",0,about_cb},
-//{"Manual",0,nyi},
+  {"About FLUID...",0,about_cb},
+  {"On FLUID...",0,help_cb},
+  {"Manual...",0,manual_cb},
   {0},
 {0}};
 
@@ -478,5 +502,5 @@ int main(int argc,char **argv) {
 }
 
 //
-// End of "$Id: fluid.cxx,v 1.15.2.13.2.2 2001/08/05 15:34:28 easysw Exp $".
+// End of "$Id: fluid.cxx,v 1.15.2.13.2.3 2001/08/11 16:09:26 easysw Exp $".
 //
diff --git a/fluid/makedepend b/fluid/makedepend
index aa314c0ce..c16332389 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -4,8 +4,8 @@ Fl_Function_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Function_Type.o: Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
 Fl_Function_Type.o: ../FL/Fl_Menu_Item.H Fluid_Image.h ../FL/Fl_Tabs.H
 Fl_Function_Type.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
-Fl_Function_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
-Fl_Function_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
+Fl_Function_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
+Fl_Function_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
 Fl_Function_Type.o: ../FL/fl_show_input.H ../FL/fl_ask.H function_panel.h
 Fl_Function_Type.o: ../FL/Fl_Window.H ../FL/Fl_Light_Button.H
 Fl_Function_Type.o: ../FL/Fl_Button.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
@@ -15,29 +15,30 @@ Fl_Menu_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Menu_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
 Fl_Menu_Type.o: ../FL/Fl_Menu_Item.H Fluid_Image.h ../FL/Fl_Tabs.H
 Fl_Menu_Type.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
-Fl_Menu_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
-Fl_Menu_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H alignment_panel.h
-Fl_Menu_Type.o: ../FL/Fl_Window.H ../FL/Fl_Box.H ../FL/Fl_Input.H
-Fl_Menu_Type.o: ../FL/Fl_Input_.H ../FL/Fl_Button.H ../FL/Fl_Light_Button.H
-Fl_Menu_Type.o: ../FL/Fl_Button.H ../FL/fl_message.H ../FL/fl_ask.H
-Fl_Menu_Type.o: ../FL/Fl_Output.H Shortcut_Button.h ../FL/fl_draw.H
+Fl_Menu_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
+Fl_Menu_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
+Fl_Menu_Type.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Box.H
+Fl_Menu_Type.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Button.H
+Fl_Menu_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H ../FL/fl_message.H
+Fl_Menu_Type.o: ../FL/fl_ask.H ../FL/Fl_Output.H Shortcut_Button.h
+Fl_Menu_Type.o: ../FL/fl_draw.H
 Fl_Group_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Group_Type.o: ../FL/Fl_Group.H ../FL/fl_message.H ../FL/fl_ask.H
 Fl_Group_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
 Fl_Group_Type.o: ../FL/Fl_Menu_Item.H Fluid_Image.h ../FL/Fl_Tabs.H
-Fl_Group_Type.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Menu_.H
-Fl_Group_Type.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H
-Fl_Group_Type.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Scroll.H ../FL/Fl_Scrollbar.H
-Fl_Group_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
+Fl_Group_Type.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H
+Fl_Group_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
+Fl_Group_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Scroll.H
+Fl_Group_Type.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
 Fl_Widget_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Widget_Type.o: ../FL/Fl_Group.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
 Fl_Widget_Type.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H
 Fl_Widget_Type.o: ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h
 Fl_Widget_Type.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Pack.H
-Fl_Widget_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
-Fl_Widget_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H alignment_panel.h
-Fl_Widget_Type.o: ../FL/Fl_Window.H ../FL/Fl_Box.H ../FL/Fl_Button.H
-Fl_Widget_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
+Fl_Widget_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
+Fl_Widget_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
+Fl_Widget_Type.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Box.H
+Fl_Widget_Type.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
 Fl_Widget_Type.o: ../FL/fl_message.H ../FL/fl_ask.H ../FL/Fl_Slider.H
 Fl_Widget_Type.o: ../FL/Fl_Valuator.H widget_panel.h ../FL/Fl_Value_Input.H
 Fl_Widget_Type.o: ../FL/Fl_Input.H Shortcut_Button.h ../FL/Fl_Return_Button.H
@@ -47,8 +48,8 @@ Fl_Type.o: ../FL/Fl_Browser_.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H
 Fl_Type.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/fl_draw.H Fl_Type.h
 Fl_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H
 Fl_Type.o: Fluid_Image.h ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
-Fl_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
-Fl_Type.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
+Fl_Type.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
+Fl_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
 Fl_Window_Type.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Window_Type.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
 Fl_Window_Type.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/fl_message.H
@@ -56,64 +57,67 @@ Fl_Window_Type.o: ../FL/fl_ask.H ../FL/fl_draw.H ../FL/Fl_Menu_Item.H
 Fl_Window_Type.o: ../FL/Fl_Widget.H Fl_Widget_Type.h Fl_Type.h
 Fl_Window_Type.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H
 Fl_Window_Type.o: Fluid_Image.h ../FL/Fl_Tabs.H ../FL/Fl_Pack.H
-Fl_Window_Type.o: ../FL/Fl_Group.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
-Fl_Window_Type.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
-Fl_Window_Type.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Box.H
-Fl_Window_Type.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Button.H
-Fl_Window_Type.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H widget_panel.h
-Fl_Window_Type.o: ../FL/Fl_Value_Input.H ../FL/Fl_Valuator.H ../FL/Fl_Input.H
-Fl_Window_Type.o: Shortcut_Button.h ../FL/Fl_Return_Button.H
+Fl_Window_Type.o: ../FL/Fl_Group.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H
+Fl_Window_Type.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H
+Fl_Window_Type.o: ../FL/Fl_Menu_Bar.H alignment_panel.h ../FL/Fl_Window.H
+Fl_Window_Type.o: ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
+Fl_Window_Type.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
+Fl_Window_Type.o: widget_panel.h ../FL/Fl_Value_Input.H ../FL/Fl_Valuator.H
+Fl_Window_Type.o: ../FL/Fl_Input.H Shortcut_Button.h ../FL/Fl_Return_Button.H
 Fluid_Image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 Fluid_Image.o: ../FL/Fl_Widget.H Fl_Type.h ../FL/Fl_Menu.H
 Fluid_Image.o: ../FL/Fl_Menu_Item.H Fluid_Image.h ../FL/Fl_Tabs.H
 Fluid_Image.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
-Fluid_Image.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
-Fluid_Image.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H ../FL/filename.H
-Fluid_Image.o: ../FL/Fl_Pixmap.H ../FL/Fl_Image.H
+Fluid_Image.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
+Fluid_Image.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
+Fluid_Image.o: ../FL/filename.H ../FL/Fl_Pixmap.H ../FL/Fl_Image.H
 code.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H Fl_Type.h
 code.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h
 code.o: ../FL/Fl_Tabs.H ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Group.H
-code.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
-code.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H alignment_panel.h
-code.o: ../FL/Fl_Window.H ../FL/Fl_Box.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-code.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
-code.o: ../FL/filename.H
+code.o: ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H
+code.o: ../FL/Fl_Menu_.H ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H
+code.o: alignment_panel.h ../FL/Fl_Window.H ../FL/Fl_Box.H ../FL/Fl_Input.H
+code.o: ../FL/Fl_Input_.H ../FL/Fl_Button.H ../FL/Fl_Light_Button.H
+code.o: ../FL/Fl_Button.H ../FL/filename.H
 factory.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Group.H
 factory.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../config.h
 factory.o: Fl_Widget_Type.h Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H
 factory.o: ../FL/Fl_Menu_Item.H Fluid_Image.h ../FL/Fl_Tabs.H
-factory.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Menu_.H
-factory.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Choice.H
-factory.o: ../FL/Fl_Menu_Bar.H ../FL/Fl_Box.H ../FL/Fl_Button.H
-factory.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
+factory.o: ../FL/Fl_Group.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H
+factory.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H
+factory.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Box.H
+factory.o: ../FL/Fl_Button.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
 factory.o: ../FL/Fl_Repeat_Button.H ../FL/Fl.H ../FL/Fl_Light_Button.H
 factory.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H
 factory.o: ../FL/Fl_Round_Button.H ../FL/Fl_Browser.H ../FL/Fl_Browser_.H
 factory.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-factory.o: ../FL/Fl_Counter.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-factory.o: ../FL/Fl_Clock.H ../FL/Fl_Adjuster.H ../FL/Fl_Dial.H
-factory.o: ../FL/Fl_Roller.H ../FL/Fl_Scrollbar.H ../FL/Fl_Output.H
-factory.o: ../FL/Fl_Value_Input.H ../FL/Fl_Input.H ../FL/Fl_Value_Output.H
-factory.o: ../FL/Fl_Value_Slider.H
+factory.o: ../FL/Fl_Check_Browser.H ../FL/Fl_FileBrowser.H ../FL/Fl_Browser.H
+factory.o: ../FL/Fl_FileIcon.H ../FL/Fl_Counter.H ../FL/Fl_Input.H
+factory.o: ../FL/Fl_Input_.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H
+factory.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Text_Editor.H
+factory.o: ../FL/Fl_Text_Display.H ../FL/Fl_Clock.H ../FL/Fl_HelpView.H
+factory.o: ../FL/Fl_Scrollbar.H ../FL/fl_draw.H ../FL/Fl_Progress.H
+factory.o: ../FL/Fl_Adjuster.H ../FL/Fl_Dial.H ../FL/Fl_Roller.H
+factory.o: ../FL/Fl_Output.H ../FL/Fl_Value_Input.H ../FL/Fl_Input.H
+factory.o: ../FL/Fl_Value_Output.H ../FL/Fl_Value_Slider.H
 file.o: alignment_panel.h ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 file.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Box.H ../FL/Fl_Input.H
 file.o: ../FL/Fl_Input_.H ../FL/Fl_Button.H ../FL/Fl_Light_Button.H
 file.o: ../FL/Fl_Button.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
 file.o: ../FL/fl_message.H ../FL/fl_ask.H Fl_Widget_Type.h Fl_Type.h
 file.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h
-file.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Menu_.H
-file.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_Bar.H
+file.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Group.H ../FL/Fl_Wizard.H
+file.o: ../FL/Fl_Menu_.H ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_Bar.H
 fluid.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 fluid.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 fluid.o: ../FL/Fl_Box.H ../FL/Fl_Button.H ../FL/Fl_Hold_Browser.H
-fluid.o: ../FL/Fl_Browser.H ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
-fluid.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Menu_Bar.H
-fluid.o: ../FL/Fl_Menu_.H ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_ask.H
-fluid.o: ../FL/fl_draw.H ../FL/fl_file_chooser.H ../FL/fl_message.H
-fluid.o: ../FL/fl_ask.H ../FL/filename.H about_panel.h ../FL/Fl_Window.H
-fluid.o: ../FL/Fl_Group.H ../FL/Fl_Return_Button.H ../FL/Fl_Button.H
-fluid.o: Fl_Type.h ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H
-fluid.o: Fluid_Image.h ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Menu_.H
+fluid.o: ../FL/Fl_Browser.H ../FL/Fl_Menu_Bar.H ../FL/Fl_Menu_.H
+fluid.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/fl_ask.H ../FL/fl_draw.H
+fluid.o: ../FL/fl_file_chooser.H ../FL/fl_message.H ../FL/fl_ask.H
+fluid.o: ../FL/filename.H about_panel.h ../FL/Fl_Window.H ../FL/Fl_Group.H
+fluid.o: ../FL/Fl_Return_Button.H ../FL/Fl_Button.H Fl_Type.h
+fluid.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H ../FL/Fl_Menu_Item.H Fluid_Image.h
+fluid.o: ../FL/Fl_Tabs.H ../FL/Fl_Pack.H ../FL/Fl_Wizard.H ../FL/Fl_Menu_.H
 fluid.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Choice.H
 about_panel.o: about_panel.h ../FL/Fl.H ../FL/Enumerations.H
 about_panel.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl_Group.H