Changeset 6666 for trunk/EDIT4/ED4_main.cxx

Timestamp:

21/05/10 19:44:17 (2 years ago)

Author:

westram

Message:

• AW_root
  • ctor initializes AWAR subsystem
  • made more clear that AW_root is a singleton
  • call dtor atexit; unlink AWARs from prop-DB and free memory (AW_window instances and releated mem still remain)
  • close properties DB
  • renamed some functions
• AW_awar
  • added dtor
• added AWT_create_root (necessary to add properties DB to DB-browser)
• removed AWT_open_properties (done inside AW_root-ctor now)
• EDIT properties
  • detect existing properties before constructing AW_root
• removed AW_config_struct

Files:

• trunk/EDIT4/ED4_main.cxx (modified) (4 diffs)

trunk/EDIT4/ED4_main.cxx

@@ -482 +482 @@
 }
 
-
-static void openProperties() {
-    for (int mode = 0; mode <= 2; ++mode) { // search for defaults-database
-        const char *name  = ED4_propertyName(mode);
-        AW_default  found = ED4_ROOT->aw_root->open_default(name, mode == 2); // if mode == 2 -> create if missing
-
-        if (found) {
-            ED4_ROOT->props_db = found;
-            ED4_ROOT->db_name  = strdup(name);
-            break;
-        }
-    }
-
-    GB_informationf("Using properties from '%s'", ED4_ROOT->db_name);
-#if defined(DEBUG)
-    AWT_announce_properties_to_browser(ED4_ROOT->props_db, ED4_ROOT->db_name);
-#endif // DEBUG
-    ED4_ROOT->aw_root->init_variables(ED4_ROOT->props_db); // pass defaults
-}
-
 int main(int argc, char **argv)
 {
@@ -542 +522 @@
     }
 
+    aw_initstatus();
+
     GLOBAL_gb_main = GB_open(data_path, "rwt");
     if (!GLOBAL_gb_main)
@@ -552 +534 @@
     AWT_announce_db_to_browser(GLOBAL_gb_main, GBS_global_string("ARB database (%s)", data_path));
 #endif // DEBUG
+
     ED4_ROOT = new ED4_root;
-
-    openProperties(); // open properties database
-
-    ED4_ROOT->aw_root->init_root("ARB_EDIT4", false); // initialize window-system
 
     ED4_ROOT->database = new EDB_root_bact;
@@ -563 +542 @@
 
     ED4_ROOT->st_ml = STAT_create_ST_ML(GLOBAL_gb_main);
-    ED4_ROOT->sequence_colors = new AWT_seq_colors((GBDATA *)ED4_ROOT->aw_root->application_database, (int)ED4_G_SEQUENCES, ED4_refresh_window, 0, 0);
+    ED4_ROOT->sequence_colors = new AWT_seq_colors(AW_ROOT_DEFAULT, ED4_G_SEQUENCES, ED4_refresh_window, 0, 0);
 
     ED4_ROOT->edk = new ed_key;