root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 2.2

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :

Corretto metodo di inserimento pagine dinamico


git-svn-id: svn://10.65.10.50/trunk@13035 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2005-05-02 16:39:54 +00:00
parent 8578ee5421
commit 7bac572d74
6 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/controls.cpp
View File

@ -1088,6 +1088,16 @@ void TControl::set_caption(const char* c)
xi_set_text(_obj, (char*)c);
}
void TControl::destroy()
{
if (_obj != NULL)
{
xi_delete(_obj);
_obj = NULL;
}
}
///////////////////////////////////////////////////////////
// TText
///////////////////////////////////////////////////////////

2
include/controls.h
View File

@ -99,6 +99,8 @@ public:
virtual void show(bool on = TRUE);
void hide() { show(FALSE); }
virtual void destroy();
virtual void set_rjust(bool on = TRUE);
void set_ljust() { set_rjust(FALSE); }

16
include/date.cpp
View File

@ -377,21 +377,23 @@ int TDate::week() const
bool TDate::is_holiday() const
{
bool holiday = wday() > 5;
bool holiday = wday() > 5; // Week-end
if (!holiday)
{
const int d = day();
const int m = month();
if ((m == 1) && ((d == 1) || (d == 6)))
if ((m == 1) && ((d == 1) || (d == 6))) // Capodanno ed Epifania
return true;
if ((m == 4) && (d == 25))
if ((m == 4) && (d == 25)) // Liberazione
return true;
if ((m == 5) && (d == 1))
if ((m == 5) && (d == 1)) // Festa dei Lavoratori
return true;
if ((m == 8) && (d == 15))
if ((m == 6) && (d == 2)) // Festa della Repubblica
return true;
if ((m == 11) && (d == 1))
if ((m == 8) && (d == 15)) // Ferragosto
return true;
if ((m == 11) && (d == 1)) // Ognissanti
return true;
if ((m == 12) && ((d == 8) || (d == 25) || (d == 26)))
return true;

3
include/mask.cpp
View File

@ -1088,7 +1088,10 @@ WINDOW TMask::insert_page(const char* title, int where)
{
TMask_field& tag = fld(i);
if (tag.dlg() >= DLG_PAGETAGS)
{
tag.destroy();
_field.destroy(i);
}
else
break;
}

5
include/maskfld.cpp
View File

@ -309,6 +309,11 @@ void TMask_field::construct(TScanner& scanner, WINDOW parent)
create(parent);
}
void TMask_field::destroy()
{
_ctl->destroy();
}
void TMask_field::set_group(byte group)
{
if (_groups == NULL)

1
include/maskfld.h
View File

@ -130,6 +130,7 @@ protected:
// @cmember Costruisce il campo con i suoi parametri
void construct(short id, const char* prompt, int x, int y, int len, WINDOW parent, const char* flags = "", int width = 0);
void destroy();
// @cmember Legge la testata del controllo dal file .msk <p scanner>
virtual void parse_head(TScanner& scanner);