diff --git a/include/stack.cpp b/include/stack.cpp index 46f19a2e2..6eac189b9 100755 --- a/include/stack.cpp +++ b/include/stack.cpp @@ -1,7 +1,10 @@ #include TStack::TStack(int size) : _data(size), _sp(0) -{} +{ } + +TStack::TStack(const TStack& stack) : _data(stack._data), _sp(0) +{ } void TStack::push(const TObject& o) { diff --git a/include/stack.h b/include/stack.h index 1f87ad974..99e7cdf19 100755 --- a/include/stack.h +++ b/include/stack.h @@ -40,6 +40,8 @@ public: bool destroy_base(); // @cmember Costruttore. Chiama il costruttore di TStack(int size = 16); + // @cmember Costruttore. Chiama il costruttore di + TStack(const TStack& stack); // @cmember Distruttore. Chiama il distruttore di virtual ~TStack() { } }; diff --git a/include/tabapp.h b/include/tabapp.h index e8e5a6f27..343c8c463 100755 --- a/include/tabapp.h +++ b/include/tabapp.h @@ -11,6 +11,8 @@ #define FPC "FPC" +#define TTable_application Tab_application + // @doc EXTERNAL // @class Tab_application | Classe per la definizione della per le tabelle @@ -56,16 +58,16 @@ protected: // @cmember imposta la maschera (se non indicata, usa le convenzioni di default) ed eventualmente disalloca quella usata in precedenza virtual TMask* set_mask(TMask* mask = NULL); - // @access Public Member public: + // @cmember Ritorna il nome della tabella + const TString& get_tabname() const + { return _tabname; } + // @cmember Costruttore Tab_application(); // @cmember Distruttore virtual ~Tab_application(); - // @cmember Ritorna il nome della tabella - const TString& get_tabname() const - { return _tabname; } }; #endif diff --git a/include/tabutil.cpp b/include/tabutil.cpp index b84f210db..35fddfb6c 100755 --- a/include/tabutil.cpp +++ b/include/tabutil.cpp @@ -34,13 +34,15 @@ int TTable::skip(TRecnotype nrec, word lockop) { if (nrec > 0) { - if (lockop == _lock) TBaseisamfile::reread(_unlock); + if (lockop == _lock) + TBaseisamfile::reread(_unlock); last(lockop); setstatus(_iseof); } else { - if (lockop == _lock) TBaseisamfile::reread(_unlock); + if (lockop == _lock) + TBaseisamfile::reread(_unlock); first(lockop); setstatus(_isbof); } @@ -155,12 +157,15 @@ void TTable::load_module_description() if (list_files(n, f) == 1) { n = f.row(0); - if (!fexist(n)) + if (!n.exist()) n.overwrite("ba",0); - if (fexist(n)) + if (n.exist()) { if (_module.empty()) + { _module = n.left(2); + _module.lower(); + } TScanner m(n); bool ok = TRUE; while (ok) diff --git a/include/viswin.cpp b/include/viswin.cpp index 60f5663cc..c259e5dfd 100755 --- a/include/viswin.cpp +++ b/include/viswin.cpp @@ -1518,9 +1518,9 @@ void TViswin::handler (WINDOW win, EVENT * ep) p = ep->v.mouse.where; if (_selecting) _isselection = TRUE;; - { - _isselection = TRUE; - } + { + _isselection = TRUE; + } // scroll if necessary if (p.y >= _textrows + 1l) { @@ -2272,8 +2272,9 @@ void TViswin::close_print () if (_toplevel) { xvt_menu_set_item_title(win(), M_EDIT_QUIT, "Chiudi\tESC"); - enable_menu_item(M_EDIT_CLIPBOARD, FALSE); - _print_button->enable(); + enable_menu_item(M_EDIT_CLIPBOARD, FALSE); + if (_print_button) + _print_button->enable(); enable_menu_item(M_EDIT_SEL_ALL, TRUE); // build bookmark menu tree _bookmarks = &(printer().get_bookmarks()); @@ -2294,7 +2295,7 @@ void TViswin::goto_end() void TViswin::goto_top() { - goto_pos(0l,0l);; + goto_pos(0l,0l); } // @doc INTERNAL