Changeset 6666 for trunk/WETC/WETC_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/WETC/WETC_main.cxx (modified) (1 diff)

trunk/WETC/WETC_main.cxx

@@ -16 +16 @@
 
 int main(int argc, char **argv) {
-    if (argc <1) {
-        GB_export_error("Syntax: arb_wetc [-fileedit]");
-        GB_print_error();
-        exit(-1);
+    GB_ERROR error = NULL;
+
+    if (argc != 3) {
+        error = "Missing arguments";
+    }
+    else {
+        const char *com  = argv[1];
+        const char *file = argv[2];
+
+        if (strcmp(com, "-fileedit") != 0) {
+            error = GBS_global_string("Unexpected parameter '%s'", com);
+        }
+        else {
+            AW_root *aw_root = AWT_create_root(".arb_prop/ntree.arb", "ARB_WETC");
+
+            AWT_show_file(aw_root, file);
+            aw_root->window_hide();
+            AWT_install_cb_guards();
+            aw_root->main_loop();
+
+        }
     }
 
-    const char *com        = argv[1];
-    AW_root    *aw_root    = new AW_root;
-    AW_default  aw_default = AWT_open_properties(aw_root, ".arb_prop/ntree.arb");
-    
-    aw_root->init_variables(aw_default);
-    aw_root->init_root("ARB_WETC", false);
-
-    if (!strcmp(com, "-fileedit")) {
-        AWT_show_file(aw_root, argv[2]);
+    if (error) {
+        fprintf(stderr,
+                "Syntax: arb_wetc -fileedit filename\n"
+                "Error: %s\n",
+                error);
+        return EXIT_FAILURE;
     }
-    else {
-        GB_export_error("wrong parameter, allowed: [-fileedit] file");
-        GB_print_error();
-        exit(-1);
-    }
-    aw_root->window_hide();
-    AWT_install_cb_guards();
-    aw_root->main_loop();
-    return 0;
+    return EXIT_SUCCESS;
 }