diff --git a/ba/ba883.cpp b/ba/ba883.cpp index f2ace5a16..8881f85b8 100755 --- a/ba/ba883.cpp +++ b/ba/ba883.cpp @@ -1,7 +1,10 @@ -#include -#include +#include +#include #include +/* +#include + /////////////////////////////////////////////////////////// // Test Relapp /////////////////////////////////////////////////////////// @@ -50,7 +53,9 @@ bool TTestrel_application::user_destroy() delete _msk; delete _rel; return TRUE; -} +} + +*/ /////////////////////////////////////////////////////////// // Testmask @@ -71,23 +76,8 @@ public: bool TTest_application::menu(MENU_TAG) { - KEY k; - if (_maskname.empty()) - { - TMask m("Inserire il nome della maschera", 1, 42, 4); - m.add_string(101, 0, "", 1, 1, 40); - m.efield(101).check_type(CHECK_REQUIRED); - m.add_button(DLG_OK, 0, "", -12, -1, 10, 2); - m.add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2); - k = m.run(); - if (k == K_ENTER) - _maskname = m.get(101); - else - return FALSE; - } - TMask m(_maskname); - k = m.run(); + KEY k = m.run(); if (k == K_QUIT) stop_run(); return k != K_QUIT; @@ -100,21 +90,37 @@ int main(int argc, char** argv) { TApplication::check_parameters(argc, argv); - if (argc > 1) - { - if (argc < 3) + if (argc < 3) + { + TFilename n; + if (argc == 1) { - TTest_application a(argv[1]); - TFilename n(argv[1]); + TMask m("Inserire il nome della maschera", 1, 42, 4); + m.add_string(101, 0, "", 1, 1, 40); + m.field(101).check_type(CHECK_REQUIRED); + m.add_button(DLG_OK, 0, "", -12, -1, 10, 2); + m.add_button(DLG_CANCEL, 0, "", -22, -1, 10, 2); + if (m.run() == K_ENTER) + n = m.get(101); + } + else + n = argv[1]; + + if (n.not_empty()) + { + TTest_application a(n); n = n.name(); n.insert("Test Mask ", 0); a.run(argc, argv, n); - } - else - { - TTestrel_application a(argv[1], argv[2]); - a.run(argc, argv, "Test Relation Application"); - } - } + } + } +/* + else + { + TTestrel_application a(argv[1], argv[2]); + a.run(argc, argv, "Test Relation Application"); + } +*/ + return 0; }