Added ide generating code to command line version of Fluid.

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

13 files changed, 21 insertions, 676 deletions

diff --git a/fltk.db b/fltk.db
index 2a852b962..a480c259f 100644
--- a/fltk.db
+++ b/fltk.db
@@ -1948,12 +1948,6 @@ refUUID:CF86DE45-3D24-44F4-B37C-F404B836B3E4
 xcBuildFileID:3B5132A7C2C4AFC712117A4C
 (filename):fluid/ide_support.cxx
 
-[./targets/apps/9AFEE04E-0E02-4697-B615-91B4D887674E/sources/D51DDFC4-57D2-4FE1-9E73-3CB4B41C72FF]
-
-refUUID:C3D42E72-8BB2-4D9E-A5C7-F845E117C1AB
-xcBuildFileID:B3BA6EDC6CBD904947309845
-(filename):fluid/ide_support_ui.cxx
-
 [./targets/apps/9AFEE04E-0E02-4697-B615-91B4D887674E/sources/A29B936C-3904-4CFF-BAAD-1454631CA22F]
 
 refUUID:D6D7D90E-247B-40A3-93E9-5751AF5D8A51
@@ -8205,11 +8199,6 @@ xcFileID:DBF6EDA27C635719920302A4
 pathAndName:test/valuators.fl
 xcFileID:5717D41C78457FC08C73366E
 
-[./files/C3D42E72-8BB2-4D9E-A5C7-F845E117C1AB]
-
-pathAndName:fluid/ide_support_ui.cxx
-xcFileID:BE8AEC5B94A33E971A141F65
-
 [./files/16547AA2-1A34-443F-9FB5-75A850D3B123]
 
 pathAndName:fluid/ide_maketools.cxx
diff --git a/fluid/Makefile b/fluid/Makefile
index e24820af3..18178f093 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -42,6 +42,10 @@ CPPFILES = \
 	file.cxx \
 	fluid.cxx \
 	function_panel.cxx \
+	ide_maketools.cxx \
+	ide_support.cxx \
+	ide_visualc.cxx \
+	ide_xcode.cxx \
 	template_panel.cxx \
 	undo.cxx \
 	widget_panel.cxx
diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx
index f62f268f9..a09b8dce8 100644
--- a/fluid/alignment_panel.cxx
+++ b/fluid/alignment_panel.cxx
@@ -217,17 +217,6 @@ fluid_prefs.set("show_comments", show_comments);
 redraw_browser();
 }
 
-Fl_Check_Button *show_coredevmenus_button=(Fl_Check_Button *)0;
-
-static void cb_show_coredevmenus_button(Fl_Check_Button*, void*) {
-  show_coredevmenus = show_coredevmenus_button->value();
-fluid_prefs.set("show_coredevmenus", show_coredevmenus);
-if (show_coredevmenus) 
-  dbmanager_item->show(); 
-else 
-  dbmanager_item->hide();
-}
-
 Fl_Spinner *recent_spinner=(Fl_Spinner *)0;
 
 static void cb_recent_spinner(Fl_Spinner*, void*) {
@@ -240,7 +229,7 @@ static void cb_Close1(Fl_Button*, void*) {
 }
 
 Fl_Double_Window* make_settings_window() {
-  { settings_window = new Fl_Double_Window(342, 269, "GUI Settings");
+  { settings_window = new Fl_Double_Window(339, 241, "GUI Settings");
     { scheme_choice = new Fl_Choice(116, 10, 115, 25, "Scheme: ");
       scheme_choice->down_box(FL_BORDER_BOX);
       scheme_choice->labelfont(1);
@@ -251,9 +240,9 @@ Fl_Double_Window* make_settings_window() {
       scheme_choice->value(s);
       scheme_cb(0, 0);
     } // Fl_Choice* scheme_choice
-    { Fl_Group* o = new Fl_Group(116, 43, 220, 149);
+    { Fl_Group* o = new Fl_Group(116, 43, 220, 126);
       o->labelfont(1);
-      o->align(Fl_Align(FL_ALIGN_LEFT));
+      o->align(Fl_Align(FL_ALIGN_CENTER));
       { Fl_Box* o = new Fl_Box(116, 43, 1, 25, "Options: ");
         o->labelfont(1);
         o->align(Fl_Align(FL_ALIGN_LEFT));
@@ -293,16 +282,9 @@ Fl_Double_Window* make_settings_window() {
         fluid_prefs.get("show_comments", show_comments, 1);
         show_comments_button->value(show_comments);
       } // Fl_Check_Button* show_comments_button
-      { show_coredevmenus_button = new Fl_Check_Button(116, 167, 209, 25, "Show Core Developer Menus");
-        show_coredevmenus_button->down_box(FL_DOWN_BOX);
-        show_coredevmenus_button->callback((Fl_Callback*)cb_show_coredevmenus_button);
-        fluid_prefs.get("show_coredevmenus", show_coredevmenus, 0);
-        show_coredevmenus_button->value(show_coredevmenus);
-        if (!show_coredevmenus) dbmanager_item->hide();
-      } // Fl_Check_Button* show_coredevmenus_button
       o->end();
     } // Fl_Group* o
-    { recent_spinner = new Fl_Spinner(115, 199, 40, 25, "# Recent Files: ");
+    { recent_spinner = new Fl_Spinner(115, 173, 40, 25, "# Recent Files: ");
       recent_spinner->labelfont(1);
       recent_spinner->callback((Fl_Callback*)cb_recent_spinner);
       recent_spinner->when(FL_WHEN_CHANGED);
@@ -311,7 +293,7 @@ Fl_Double_Window* make_settings_window() {
       recent_spinner->maximum(10);
       recent_spinner->value(c);
     } // Fl_Spinner* recent_spinner
-    { Fl_Button* o = new Fl_Button(266, 231, 64, 25, "Close");
+    { Fl_Button* o = new Fl_Button(266, 205, 64, 25, "Close");
       o->tooltip("Close this dialog.");
       o->callback((Fl_Callback*)cb_Close1);
     } // Fl_Button* o
diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl
index 0aa05fd90..3c782bb85 100644
--- a/fluid/alignment_panel.fl
+++ b/fluid/alignment_panel.fl
@@ -157,10 +157,11 @@ decl {Fl_Text_Buffer *shell_run_buffer;} {public local
 decl {void scheme_cb(Fl_Choice *, void *);} {public local
 } 
 
-Function {make_settings_window()} {} {
+Function {make_settings_window()} {open
+} {
   Fl_Window settings_window {
     label {GUI Settings} open
-    xywh {393 191 342 269} type Double non_modal visible
+    xywh {393 191 339 241} type Double non_modal visible
   } {
     Fl_Choice scheme_choice {
       label {Scheme: }
@@ -188,8 +189,8 @@ Function {make_settings_window()} {} {
         xywh {10 10 35 25}
       }
     }
-    Fl_Group {} {open
-      xywh {116 43 220 149} labelfont 1 align 4
+    Fl_Group {} {open selected
+      xywh {116 43 220 126} labelfont 1 align 0
     } {
       Fl_Box {} {
         label {Options: }
@@ -238,25 +239,12 @@ redraw_browser();}
         code1 {fluid_prefs.get("show_comments", show_comments, 1);}
         code2 {show_comments_button->value(show_comments);}
       }
-      Fl_Check_Button show_coredevmenus_button {
-        label {Show Core Developer Menus}
-        callback {show_coredevmenus = show_coredevmenus_button->value();
-fluid_prefs.set("show_coredevmenus", show_coredevmenus);
-if (show_coredevmenus) 
-  dbmanager_item->show(); 
-else 
-  dbmanager_item->hide();}
-        xywh {116 167 209 25} down_box DOWN_BOX
-        code1 {fluid_prefs.get("show_coredevmenus", show_coredevmenus, 0);}
-        code2 {show_coredevmenus_button->value(show_coredevmenus);}
-        code3 {if (!show_coredevmenus) dbmanager_item->hide();}
-      }
     }
     Fl_Spinner recent_spinner {
       label {\# Recent Files: }
       callback {fluid_prefs.set("recent_files", recent_spinner->value());
 load_history();}
-      xywh {115 199 40 25} labelfont 1 when 1
+      xywh {115 173 40 25} labelfont 1 when 1
       code0 {int c;}
       code1 {fluid_prefs.get("recent_files", c, 5);}
       code2 {recent_spinner->maximum(10);}
@@ -265,7 +253,7 @@ load_history();}
     Fl_Button {} {
       label Close
       callback {settings_window->hide();}
-      tooltip {Close this dialog.} xywh {266 231 64 25}
+      tooltip {Close this dialog.} xywh {266 205 64 25}
     }
   }
 } 
diff --git a/fluid/alignment_panel.h b/fluid/alignment_panel.h
index 4d48b6187..b5e6b201e 100644
--- a/fluid/alignment_panel.h
+++ b/fluid/alignment_panel.h
@@ -77,7 +77,6 @@ extern Fl_Check_Button *completion_button;
 extern Fl_Check_Button *openlast_button;
 extern Fl_Check_Button *prevpos_button;
 extern Fl_Check_Button *show_comments_button;
-extern Fl_Check_Button *show_coredevmenus_button;
 #include <FL/Fl_Spinner.H>
 extern Fl_Spinner *recent_spinner;
 Fl_Double_Window* make_settings_window();
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index e9414eb06..0ec8c609d 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -118,7 +118,6 @@ Fl_Menu_Item *save_item = 0L;
 Fl_Menu_Item *history_item = 0L;
 Fl_Menu_Item *widgetbin_item = 0L;
 Fl_Menu_Item *sourceview_item = 0L;
-Fl_Menu_Item *dbmanager_item = 0L;
 
 ////////////////////////////////////////////////////////////////
 
@@ -1605,12 +1604,6 @@ void dbmake_cb(Fl_Widget*, void*) {
   if (pi) pi->test("/Users/matt/dev/fltk-1.3.0/fltk.db", "/Users/matt/dev/fltk-1.3.0");
 }
 
-void show_dbmanager_cb(Fl_Widget*, void*) {
-  Fl_Plugin_Manager pm("commandline");  
-  Fl_Commandline_Plugin *pi = (Fl_Commandline_Plugin*)pm.plugin("FltkDB.fluid.fltk.org");
-  if (pi) pi->show_panel();
-}
-
 ////////////////////////////////////////////////////////////////
 
 extern Fl_Menu_Item New_Menu[];
@@ -1664,7 +1657,6 @@ Fl_Menu_Item Main_Menu[] = {
   {"Show Source Code...",FL_ALT+FL_SHIFT+'s', (Fl_Callback*)toggle_sourceview_cb, 0, FL_MENU_DIVIDER},
   {"Pro&ject Settings...",FL_ALT+'p',show_project_cb},
   {"GU&I Settings...",FL_ALT+FL_SHIFT+'p',show_settings_cb},
-  {"Manage &FLTK Database...",0,show_dbmanager_cb},
   {0},
 {"&New", 0, 0, (void *)New_Menu, FL_SUBMENU_POINTER},
 {"&Layout",0,0,0,FL_SUBMENU},
@@ -1820,7 +1812,6 @@ void make_main_window() {
     history_item = (Fl_Menu_Item*)main_menubar->find_item(open_history_cb);
     widgetbin_item = (Fl_Menu_Item*)main_menubar->find_item(toggle_widgetbin_cb);
     sourceview_item = (Fl_Menu_Item*)main_menubar->find_item((Fl_Callback*)toggle_sourceview_cb);
-    dbmanager_item = (Fl_Menu_Item*)main_menubar->find_item((Fl_Callback*)show_dbmanager_cb);
     main_menubar->global();
     fill_in_New_Menu();
     main_window->end();
diff --git a/fluid/ide_maketools.cxx b/fluid/ide_maketools.cxx
index 2d7ae3e36..68c0872a8 100644
--- a/fluid/ide_maketools.cxx
+++ b/fluid/ide_maketools.cxx
@@ -268,6 +268,10 @@ public:
     fputs("\tfile.cxx \\\n", f);
     fputs("\tfluid.cxx \\\n", f);
     fputs("\tfunction_panel.cxx \\\n", f);
+    fputs("\tide_maketools.cxx \\\n", f);
+    fputs("\tide_support.cxx \\\n", f);
+    fputs("\tide_visualc.cxx \\\n", f);
+    fputs("\tide_xcode.cxx \\\n", f);    
     fputs("\ttemplate_panel.cxx \\\n", f);
     fputs("\tundo.cxx \\\n", f);
     fputs("\twidget_panel.cxx\n", f);
@@ -1729,7 +1733,7 @@ public:
   const char *name() { return "ideMaketools.fluid.fltk.org"; }
   const char *help() { return
     " --dbmake <dbname> <targetpath> : create all IDE files for a Makefile/autoconf based project\n"
-    "   WARNING: --dbmake is not yet implemented completely.\n"; }
+    "   WARNING: --dbmake is not yet implemented completely."; }
   int arg(int argc, char **argv, int &i) {
     if (argc>=i+1 && strcmp(argv[i], "--dbxcode3")==0) {
       if (argc>=i+3 && argv[i+1][0]!='-' && argv[i+2][0]!='-') {
diff --git a/fluid/ide_support.cxx b/fluid/ide_support.cxx
index e3d1896c6..f9abb2d8d 100644
--- a/fluid/ide_support.cxx
+++ b/fluid/ide_support.cxx
@@ -103,7 +103,6 @@
  */
 
 #include "ide_support.h"
-#include "ide_support_ui.h"
 
 #include <FL/Fl.H>
 #include <FL/fl_ask.H>
@@ -652,7 +651,6 @@ int create_new_database(const char *filename)
     fluid_app.add_source(files_db, "fluid/function_panel.cxx");
     fluid_app.add_source(files_db, "fluid/ide_maketools.cxx");
     fluid_app.add_source(files_db, "fluid/ide_support.cxx");
-    fluid_app.add_source(files_db, "fluid/ide_support_ui.cxx");
     fluid_app.add_source(files_db, "fluid/ide_visualc.cxx");
     fluid_app.add_source(files_db, "fluid/ide_xcode.cxx");
     fluid_app.add_source(files_db, "fluid/template_panel.cxx");
@@ -1167,121 +1165,6 @@ int create_new_database(const char *filename)
   return 0;
 }
 
-class Item_Manager {
-  Fl_Preferences::ID id;
-public:
-  Item_Manager(Fl_Preferences::ID idA) { id = idA; }
-  virtual ~Item_Manager() { }
-  virtual void select(Fl_Tree_Item *) { dbm_wizard->value(dbm_empty); }
-};
-
-class Test_Item_Manager : public Item_Manager {
-  Fl_Preferences::ID id;
-public:
-  Test_Item_Manager(Fl_Preferences::ID idA) : Item_Manager(idA) { }
-  virtual void select(Fl_Tree_Item *ti) { 
-    dbm_wizard->value(dbm_test);
-    dbm_test_name->value(ti->label());
-  }
-};
-
-void tree_item_cb(Fl_Tree *t, void *) {
-  Fl_Tree_Item *ti = t->item_clicked();
-  Item_Manager *im = (Item_Manager*)ti->user_data();
-  if (im) {
-    im->select(ti);
-  }
-}
-
-void ui_load_database(const char *filename)
-{
-  char buf[1024];
-  float v = 0.0f;
-  int i, j;
-  
-  dbmanager_tree->callback((Fl_Callback*)tree_item_cb);
-  
-  // FIXME: must be global, so we can close it
-  Fl_Preferences *db = new Fl_Preferences(filename, "fltk.org", 0);
-
-  // Check if this is a database
-  if (db->entries()==0) {
-    fl_alert("%s\nis not a database", filename);
-    delete db;
-    return;
-  }
-  
-  // Check if the database has the correct format
-  if (!db->entryExists("databaseFormat")) {
-    fl_alert("%s\nis not a Fluid database", filename);
-    delete db;
-    return;
-  }
-  db->get("databaseFormat", buf, "", 1024);
-  if (strcmp(buf, "FLUID_IDE_DB")!=0) {
-    fl_alert("%s\nis not a Fluid IDE database", filename);
-    delete db;
-    return;
-  }
-  db->get("databaseVersion", buf, "", 1024);
-  sscanf(buf, "%f", &v);
-  if (v>1.0f) {
-    fl_alert("The Fluid IDE database\n%s\nversion %f is not suported.", filename, v);
-    delete db;
-    return;
-  }
-  
-  // set the dialog label to the project name
-  char *name; db->get("projectName", name, "unnamed");
-  char *vers; db->get("projectVersion", vers, "0.1");
-  sprintf(buf, "%s V%s", name, vers);
-  dbmanager_window->label(buf);
-  free(vers); free(name);
-  
-  Fl_Preferences targetsDB(db, "targets");
-  Fl_Preferences filesDB(db, "files");
-  Fl_Tree_Item *ti;
-  
-  // load all tests
-  ti = dbmanager_tree->add("Applications");
-  ti->user_data(new Item_Manager(0L));
-  
-  // load all tests
-  ti = dbmanager_tree->add("Libraries & Frameworks");
-  ti->user_data(new Item_Manager(0L));
-  
-  // load all tests
-  ti = dbmanager_tree->add("Test Applications");
-  ti->user_data(new Item_Manager(0L));
-  Fl_Preferences testsDB(targetsDB, "tests");
-  for (i=0; i<testsDB.groups(); i++) {
-    Fl_Preferences testDB(testsDB, i);
-    testDB.get("name", buf, "DB-Error", 1024);
-    Fl_Tree_Item *tt = dbmanager_tree->add(ti, buf); tt->close();
-    tt->user_data(new Test_Item_Manager(testDB.id()));
-    
-    if (testDB.groupExists("sources")) {
-      Fl_Tree_Item *ts = dbmanager_tree->add(tt, "Sources"); ts->close();
-      Fl_Preferences srcsDB(testDB, "sources");
-      for (j=0; j<srcsDB.groups(); j++) {
-        Fl_Preferences srcDB(srcsDB, j);
-        srcDB.get("refUUID", buf, "DBERROR", 1024);
-        Fl_File_Prefs fileDB(filesDB, buf);
-        /* Fl_Tree_Item *tb = */ dbmanager_tree->add(ts, fileDB.fullName());
-      }
-    }
-    
-    //ts = dbmanager_tree->add(tt, "Dependencies");
-    //ts = dbmanager_tree->add(tt, "Libraries");
-    //ts = dbmanager_tree->add(tt, "Externals");
-  }
-  
-
-  dbmanager_tree->redraw();
-  delete db;
-}
-
-
 // Make this module into a plugin
 
 extern int exit_early;
@@ -1313,10 +1196,6 @@ public:
     return 0;
   }
   void show_panel() {
-    if (!dbmanager_window)
-      make_dbmanager_window();
-    dbmanager_window->label("IDE Database Manager");
-    dbmanager_window->show();
   }
 };
 
diff --git a/fluid/ide_support_ui.cxx b/fluid/ide_support_ui.cxx
deleted file mode 100644
index 0815548d1..000000000
--- a/fluid/ide_support_ui.cxx
+++ /dev/null
@@ -1,213 +0,0 @@
-//
-// "$Id: ide_support_ui.fl 6614 2009-01-01 16:11:32Z matt $"
-//
-// Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
-//
-// Copyright 1998-2009 by Bill Spitzak and others.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-//
-// Please report all bugs and problems on the following page:
-//
-//     http://www.fltk.org/str.php
-//
-
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
-
-#include "ide_support_ui.h"
-#include "ide_support.h"
-#include <FL/Fl_File_Chooser.H>
-
-Fl_Double_Window *dbmanager_window=(Fl_Double_Window *)0;
-
-Fl_Tree *dbmanager_tree=(Fl_Tree *)0;
-
-static void cb_Open(Fl_Button*, void*) {
-  const char *filename = fl_file_chooser("Load Database", "*.db", 0, 0);
-if (filename) {
-  ui_load_database(filename);
-};
-}
-
-static void cb_New(Fl_Button*, void*) {
-  const char *filename = fl_file_chooser("Load Database", "*.db", 0, 0);
-if (filename) {
-  ui_load_database(filename);
-};
-}
-
-Fl_Wizard *dbm_wizard=(Fl_Wizard *)0;
-
-Fl_Group *dbm_empty=(Fl_Group *)0;
-
-Fl_Group *dbm_app=(Fl_Group *)0;
-
-Fl_Input *dbm_app_name=(Fl_Input *)0;
-
-Fl_Group *dbm_lib=(Fl_Group *)0;
-
-Fl_Input *dbm_lib_name=(Fl_Input *)0;
-
-Fl_Group *dbm_test=(Fl_Group *)0;
-
-Fl_Input *dbm_test_name=(Fl_Input *)0;
-
-Fl_Group *dbm_sources=(Fl_Group *)0;
-
-Fl_Group *dbm_source=(Fl_Group *)0;
-
-Fl_Double_Window* make_dbmanager_window() {
-  { dbmanager_window = new Fl_Double_Window(427, 500);
-    { dbmanager_tree = new Fl_Tree(8, 8, 200, 480);
-      dbmanager_tree->box(FL_DOWN_BOX);
-      dbmanager_tree->color((Fl_Color)55);
-      dbmanager_tree->selection_color(FL_BACKGROUND_COLOR);
-      dbmanager_tree->labeltype(FL_NORMAL_LABEL);
-      dbmanager_tree->labelfont(0);
-      dbmanager_tree->labelsize(14);
-      dbmanager_tree->labelcolor(FL_FOREGROUND_COLOR);
-      dbmanager_tree->align(Fl_Align(FL_ALIGN_CENTER));
-      dbmanager_tree->when(FL_WHEN_CHANGED);
-      Fl_Group::current()->resizable(dbmanager_tree);
-      dbmanager_tree->showroot(0);
-    } // Fl_Tree* dbmanager_tree
-    { Fl_Group* o = new Fl_Group(216, 8, 200, 444);
-      { Fl_Group* o = new Fl_Group(224, 364, 184, 79);
-        o->end();
-        Fl_Group::current()->resizable(o);
-      } // Fl_Group* o
-      { Fl_Button* o = new Fl_Button(240, 52, 152, 28, "Open Database...");
-        o->callback((Fl_Callback*)cb_Open);
-      } // Fl_Button* o
-      { Fl_Button* o = new Fl_Button(240, 16, 152, 28, " (New Database... )");
-        o->callback((Fl_Callback*)cb_New);
-        o->deactivate();
-      } // Fl_Button* o
-      { dbm_wizard = new Fl_Wizard(216, 92, 200, 272);
-        dbm_wizard->box(FL_ENGRAVED_BOX);
-        { dbm_empty = new Fl_Group(216, 92, 200, 272);
-          dbm_empty->hide();
-          dbm_empty->end();
-        } // Fl_Group* dbm_empty
-        { dbm_app = new Fl_Group(216, 92, 200, 272);
-          dbm_app->hide();
-          { dbm_app_name = new Fl_Input(280, 108, 111, 24, "(Name:)");
-            dbm_app_name->deactivate();
-          } // Fl_Input* dbm_app_name
-          { Fl_Button* o = new Fl_Button(240, 140, 152, 28, " (New Source... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 176, 152, 28, " (Add Source... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 212, 152, 28, " (Add Library... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 248, 152, 28, " (Add Dependency... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 284, 152, 28, " (Add External Item... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 320, 152, 28, " (Remove Test...)");
-            o->deactivate();
-          } // Fl_Button* o
-          dbm_app->end();
-        } // Fl_Group* dbm_app
-        { dbm_lib = new Fl_Group(216, 92, 200, 272);
-          dbm_lib->hide();
-          { dbm_lib_name = new Fl_Input(280, 108, 111, 24, "(Name:)");
-            dbm_lib_name->deactivate();
-          } // Fl_Input* dbm_lib_name
-          { Fl_Button* o = new Fl_Button(240, 140, 152, 28, " (New Source... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 176, 152, 28, " (Add Source... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 212, 152, 28, " (Add Library... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 248, 152, 28, " (Add Dependency... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 284, 152, 28, " (Add External Item... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 320, 152, 28, " (Remove Test...)");
-            o->deactivate();
-          } // Fl_Button* o
-          dbm_lib->end();
-        } // Fl_Group* dbm_lib
-        { dbm_test = new Fl_Group(216, 92, 200, 272);
-          dbm_test->hide();
-          { dbm_test_name = new Fl_Input(280, 108, 111, 24, "(Name:)");
-            dbm_test_name->deactivate();
-          } // Fl_Input* dbm_test_name
-          { Fl_Button* o = new Fl_Button(240, 140, 152, 28, " (New Source... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 176, 152, 28, " (Add Source... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 212, 152, 28, " (Add Library... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 248, 152, 28, " (Add Dependency... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 284, 152, 28, " (Add External Item... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 320, 152, 28, " (Remove Test...)");
-            o->deactivate();
-          } // Fl_Button* o
-          dbm_test->end();
-        } // Fl_Group* dbm_test
-        { dbm_sources = new Fl_Group(216, 92, 200, 128);
-          dbm_sources->hide();
-          { Fl_Button* o = new Fl_Button(240, 104, 152, 28, " (New Source... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 140, 152, 28, " (Add Source... )");
-            o->deactivate();
-          } // Fl_Button* o
-          { Fl_Button* o = new Fl_Button(240, 176, 152, 28, " (Remove All Sources...)");
-            o->deactivate();
-          } // Fl_Button* o
-          dbm_sources->end();
-        } // Fl_Group* dbm_sources
-        { dbm_source = new Fl_Group(216, 92, 200, 52);
-          { Fl_Button* o = new Fl_Button(240, 104, 152, 28, " (Remove Source... )");
-            o->deactivate();
-          } // Fl_Button* o
-          dbm_source->end();
-        } // Fl_Group* dbm_source
-        dbm_wizard->end();
-      } // Fl_Wizard* dbm_wizard
-      o->end();
-    } // Fl_Group* o
-    { Fl_Button* o = new Fl_Button(324, 460, 92, 28, "( Close )");
-      o->deactivate();
-    } // Fl_Button* o
-    dbmanager_window->end();
-  } // Fl_Double_Window* dbmanager_window
-  return dbmanager_window;
-}
-
-//
-// End of "$Id: ide_support_ui.fl 6614 2009-01-01 16:11:32Z matt $".
-//
diff --git a/fluid/ide_support_ui.fl b/fluid/ide_support_ui.fl
deleted file mode 100644
index 72a128d3a..000000000
--- a/fluid/ide_support_ui.fl
+++ /dev/null
@@ -1,214 +0,0 @@
-# data file for the Fltk User Interface Designer (fluid)
-version 1.0300 
-header_name {.h} 
-code_name {.cxx}
-comment {//
-// "$Id: ide_support_ui.fl 6614 2009-01-01 16:11:32Z matt $"
-//
-// Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
-//
-// Copyright 1998-2009 by Bill Spitzak and others.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-//
-// Please report all bugs and problems on the following page:
-//
-//     http://www.fltk.org/str.php
-//
-} {in_source in_header
-} 
-
-decl {\#include <FL/Fl_Tree.H>} {public local
-} 
-
-decl {\#include "ide_support.h"} {private global
-} 
-
-decl {\#include <FL/Fl_File_Chooser.H>} {private global
-} 
-
-Function {make_dbmanager_window()} {open
-} {
-  Fl_Window dbmanager_window {open
-    xywh {459 167 427 500} type Double resizable visible
-  } {
-    Fl_Box dbmanager_tree {
-      xywh {8 8 200 480} box DOWN_BOX color 55 when 1 resizable
-      code0 {dbmanager_tree->showroot(0);}
-      class Fl_Tree
-    }
-    Fl_Group {} {open
-      xywh {216 8 200 444}
-    } {
-      Fl_Group {} {open
-        xywh {224 364 184 79} resizable
-      } {}
-      Fl_Button {} {
-        label {Open Database...}
-        callback {const char *filename = fl_file_chooser("Load Database", "*.db", 0, 0);
-if (filename) {
-  ui_load_database(filename);
-}}
-        xywh {240 52 152 28}
-      }
-      Fl_Button {} {
-        label { (New Database... )}
-        callback {const char *filename = fl_file_chooser("Load Database", "*.db", 0, 0);
-if (filename) {
-  ui_load_database(filename);
-}}
-        xywh {240 16 152 28} deactivate
-      }
-      Fl_Wizard dbm_wizard {open selected
-        xywh {216 92 200 272} box ENGRAVED_BOX
-      } {
-        Fl_Group dbm_empty {open
-          xywh {216 92 200 272} hide
-        } {}
-        Fl_Group dbm_app {
-          xywh {216 92 200 272} hide
-        } {
-          Fl_Input dbm_app_name {
-            label {(Name:)}
-            xywh {280 108 111 24} deactivate
-          }
-          Fl_Button {} {
-            label { (New Source... )}
-            xywh {240 140 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add Source... )}
-            xywh {240 176 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add Library... )}
-            xywh {240 212 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add Dependency... )}
-            xywh {240 248 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add External Item... )}
-            xywh {240 284 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Remove Test...)}
-            xywh {240 320 152 28} deactivate
-          }
-        }
-        Fl_Group dbm_lib {
-          xywh {216 92 200 272} hide
-        } {
-          Fl_Input dbm_lib_name {
-            label {(Name:)}
-            xywh {280 108 111 24} deactivate
-          }
-          Fl_Button {} {
-            label { (New Source... )}
-            xywh {240 140 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add Source... )}
-            xywh {240 176 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add Library... )}
-            xywh {240 212 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add Dependency... )}
-            xywh {240 248 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add External Item... )}
-            xywh {240 284 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Remove Test...)}
-            xywh {240 320 152 28} deactivate
-          }
-        }
-        Fl_Group dbm_test {
-          xywh {216 92 200 272} hide
-        } {
-          Fl_Input dbm_test_name {
-            label {(Name:)}
-            xywh {280 108 111 24} deactivate
-          }
-          Fl_Button {} {
-            label { (New Source... )}
-            xywh {240 140 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add Source... )}
-            xywh {240 176 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add Library... )}
-            xywh {240 212 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add Dependency... )}
-            xywh {240 248 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add External Item... )}
-            xywh {240 284 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Remove Test...)}
-            xywh {240 320 152 28} deactivate
-          }
-        }
-        Fl_Group dbm_sources {
-          xywh {216 92 200 128} hide
-        } {
-          Fl_Button {} {
-            label { (New Source... )}
-            xywh {240 104 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Add Source... )}
-            xywh {240 140 152 28} deactivate
-          }
-          Fl_Button {} {
-            label { (Remove All Sources...)}
-            xywh {240 176 152 28} deactivate
-          }
-        }
-        Fl_Group dbm_source {
-          xywh {216 92 200 52}
-        } {
-          Fl_Button {} {
-            label { (Remove Source... )}
-            xywh {240 104 152 28} deactivate
-          }
-        }
-      }
-    }
-    Fl_Button {} {
-      label {( Close )}
-      xywh {324 460 92 28} deactivate
-    }
-  }
-} 
-
-comment {
-//
-// End of "$Id: ide_support_ui.fl 6614 2009-01-01 16:11:32Z matt $".
-//} {in_source in_header
-} 
diff --git a/fluid/ide_support_ui.h b/fluid/ide_support_ui.h
deleted file mode 100644
index 9232e62c4..000000000
--- a/fluid/ide_support_ui.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// "$Id: ide_support_ui.fl 6614 2009-01-01 16:11:32Z matt $"
-//
-// Setting and shell dialogs for the Fast Light Tool Kit (FLTK).
-//
-// Copyright 1998-2009 by Bill Spitzak and others.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Library General Public
-// License as published by the Free Software Foundation; either
-// version 2 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Library General Public License for more details.
-//
-// You should have received a copy of the GNU Library General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-//
-// Please report all bugs and problems on the following page:
-//
-//     http://www.fltk.org/str.php
-//
-
-// generated by Fast Light User Interface Designer (fluid) version 1.0300
-
-#ifndef ide_support_ui_h
-#define ide_support_ui_h
-#include <FL/Fl.H>
-#include <FL/Fl_Tree.H>
-#include <FL/Fl_Double_Window.H>
-extern Fl_Double_Window *dbmanager_window;
-extern Fl_Tree *dbmanager_tree;
-#include <FL/Fl_Group.H>
-#include <FL/Fl_Button.H>
-#include <FL/Fl_Wizard.H>
-extern Fl_Wizard *dbm_wizard;
-extern Fl_Group *dbm_empty;
-extern Fl_Group *dbm_app;
-#include <FL/Fl_Input.H>
-extern Fl_Input *dbm_app_name;
-extern Fl_Group *dbm_lib;
-extern Fl_Input *dbm_lib_name;
-extern Fl_Group *dbm_test;
-extern Fl_Input *dbm_test_name;
-extern Fl_Group *dbm_sources;
-extern Fl_Group *dbm_source;
-Fl_Double_Window* make_dbmanager_window();
-#endif
-
-//
-// End of "$Id: ide_support_ui.fl 6614 2009-01-01 16:11:32Z matt $".
-//
diff --git a/ide/VisualC6/Fluid.dsp b/ide/VisualC6/Fluid.dsp
index b0ea2743d..a1ae14f53 100644
--- a/ide/VisualC6/Fluid.dsp
+++ b/ide/VisualC6/Fluid.dsp
@@ -163,10 +163,6 @@ SOURCE=..\..\fluid\ide_support.cxx
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\fluid\ide_support_ui.cxx

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\fluid\ide_visualc.cxx

 # End Source File

 # Begin Source File

diff --git a/ide/Xcode3/FLTK.xcodeproj/project.pbxproj b/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
index 5bb60cb1a..defef831e 100644
--- a/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
+++ b/ide/Xcode3/FLTK.xcodeproj/project.pbxproj
@@ -408,7 +408,6 @@
 		B220C8BACFB1FF8B576683AE /* fltk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
 		B33439F4D21CCF663D38D36F /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
 		B3AB7CB3BB4674496EE23A9D /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
-		B3BA6EDC6CBD904947309845 /* ide_support_ui.cxx in Sources */ = {isa = PBXBuildFile; fileRef = BE8AEC5B94A33E971A141F65 /* ide_support_ui.cxx */; };
 		B3F7E78259D54982CE9D0636 /* fltk.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F459EEE32AC6EE0087583065 /* fltk.framework */; };
 		B433FC5EB573FF9875CBF3A0 /* fl_dnd.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4BC7AF98309EC04D477C75BF /* fl_dnd.cxx */; };
 		B5866D0045327FD5656DE0D5 /* flstring.c in Sources */ = {isa = PBXBuildFile; fileRef = 1DF43319523953BD4B153A07 /* flstring.c */; };
@@ -3932,7 +3931,6 @@
 		BE710079ACC4C7D3FB2E72D6 /* Fl_Box.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Box.cxx; path = ../../src/Fl_Box.cxx; sourceTree = SOURCE_ROOT; };
 		BE7E4C70257863B05F3BEA7E /* Fl_Wizard.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Fl_Wizard.cxx; path = ../../src/Fl_Wizard.cxx; sourceTree = SOURCE_ROOT; };
 		BE840FE9120DF2BDF7C0D8B1 /* mandelbrot_ui.fl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.fluid; name = mandelbrot_ui.fl; path = ../../test/mandelbrot_ui.fl; sourceTree = SOURCE_ROOT; };
-		BE8AEC5B94A33E971A141F65 /* ide_support_ui.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ide_support_ui.cxx; path = ../../fluid/ide_support_ui.cxx; sourceTree = SOURCE_ROOT; };
 		BF24156FEE87C9CF2DF5D6DF /* pngtrans.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pngtrans.c; path = ../../png/pngtrans.c; sourceTree = SOURCE_ROOT; };
 		BF53F3C7BD0B54B51FEDD0FA /* jquant1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jquant1.c; path = ../../jpeg/jquant1.c; sourceTree = SOURCE_ROOT; };
 		C08A8ABFE2A8C2921AC63025 /* jcsample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jcsample.c; path = ../../jpeg/jcsample.c; sourceTree = SOURCE_ROOT; };
@@ -5475,7 +5473,6 @@
 				1C0E3777F229938969F8E0E7 /* function_panel.cxx */,
 				B65FCD2B8489E2BBAA3F695A /* ide_maketools.cxx */,
 				77759BD79A674B0703F21C3E /* ide_support.cxx */,
-				BE8AEC5B94A33E971A141F65 /* ide_support_ui.cxx */,
 				B50524F41B3A568F8AD761C9 /* ide_visualc.cxx */,
 				B78D76B5AC3045B586173DC9 /* ide_xcode.cxx */,
 				82D70F7B9460C9797FF03089 /* template_panel.cxx */,
@@ -8297,7 +8294,6 @@
 				CCA89C0B6F35BD769098B0B6 /* function_panel.cxx in Sources */,
 				C9C84B2983DC793B141DDC70 /* ide_maketools.cxx in Sources */,
 				3B5132A7C2C4AFC712117A4C /* ide_support.cxx in Sources */,
-				B3BA6EDC6CBD904947309845 /* ide_support_ui.cxx in Sources */,
 				3734BD3A2D1490F4EC62ACAA /* ide_visualc.cxx in Sources */,
 				92BAD1B264D06B999FABE825 /* ide_xcode.cxx in Sources */,
 				E5AD089B2DB919A31955C459 /* template_panel.cxx in Sources */,