1 files changed, 10 insertions, 10 deletions

diff --git a/fluid/Fluid.cxx b/fluid/Fluid.cxx
index 8d1bd29d3..083d00257 100644
--- a/fluid/Fluid.cxx
+++ b/fluid/Fluid.cxx
@@ -73,7 +73,7 @@ static void external_editor_timer(void*) {
     // Walk tree looking for files modified by external editors.
     int modified = 0;
     for (Node *p: Fluid.proj.tree.all_nodes()) {
-      if ( p->is_a(Type::Code) ) {
+      if ( p->is_a(FLD_NODE_TYPE_Code) ) {
         Code_Node *code = static_cast<Code_Node*>(p);
         // Code changed by external editor?
         if ( code->handle_editor_changes() ) {  // updates ram, file size/mtime
@@ -163,13 +163,13 @@ int Application::run(int argc,char **argv) {
     Fl::visual((Fl_Mode)(FL_DOUBLE|FL_INDEX));
     Fl_File_Icon::load_system_icons();
     main_window->callback(exit_cb);
-    position_window(main_window,"main_window_pos", 1, 10, 30, WINWIDTH, WINHEIGHT );
+    position_window(main_window,"main_window_pos", 1, 10, 30, FLD_WINWIDTH, FLD_WINHEIGHT );
     if (g_shell_config) {
-      g_shell_config->read(preferences, fld::Tool_Store::USER);
+      g_shell_config->read(preferences, FLD_TOOL_STORE_USER);
       g_shell_config->update_settings_dialog();
       g_shell_config->rebuild_shell_menu();
     }
-    Fluid.layout_list.read(preferences, fld::Tool_Store::USER);
+    Fluid.layout_list.read(preferences, FLD_TOOL_STORE_USER);
     main_window->show(argc,argv);
     toggle_widget_bin();
     toggle_codeview_cb(nullptr,nullptr);
@@ -292,8 +292,8 @@ void Application::quit() {
     delete help_dialog;
 
   if (g_shell_config)
-    g_shell_config->write(preferences, fld::Tool_Store::USER);
-  Fluid.layout_list.write(preferences, fld::Tool_Store::USER);
+    g_shell_config->write(preferences, FLD_TOOL_STORE_USER);
+  Fluid.layout_list.write(preferences, FLD_TOOL_STORE_USER);
 
   proj.undo.clear();
 
@@ -768,7 +768,7 @@ void Application::print_snapshots() {
   Fl_Window *win;
 
   for (auto w: proj.tree.all_widgets()) {
-    if (w->is_a(Type::Window)) {
+    if (w->is_a(FLD_NODE_TYPE_Window)) {
       Window_Node *win_t = static_cast<Window_Node*>(w);
       windows[num_windows] = win_t;
       Fl_Window *win = static_cast<Fl_Window*>(win_t->o);
@@ -1176,13 +1176,13 @@ void Application::make_main_window() {
   if (!main_window) {
     Fl_Widget *o;
     loadPixmaps();
-    main_window = new Fl_Double_Window(WINWIDTH,WINHEIGHT,"fluid");
+    main_window = new Fl_Double_Window(FLD_WINWIDTH,FLD_WINHEIGHT,"fluid");
     main_window->box(FL_NO_BOX);
-    o = make_widget_browser(0,MENUHEIGHT,BROWSERWIDTH,BROWSERHEIGHT);
+    o = make_widget_browser(0,FLD_MENUHEIGHT,FLD_BROWSERWIDTH,FLD_BROWSERHEIGHT);
     o->box(FL_FLAT_BOX);
     o->tooltip("Double-click to view or change an item.");
     main_window->resizable(o);
-    main_menubar = new fld::widget::App_Menu_Bar(0,0,BROWSERWIDTH,MENUHEIGHT);
+    main_menubar = new fld::widget::App_Menu_Bar(0,0,FLD_BROWSERWIDTH,FLD_MENUHEIGHT);
     main_menubar->menu(main_menu);
     // quick access to all dynamic menu items
     save_item = (Fl_Menu_Item*)main_menubar->find_item(menu_file_save_cb);