Corretti errori di compilazione in UNIX

git-svn-id: svn://10.65.10.50/trunk@614 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1994-11-14 12:03:26 +00:00
parent 03ab8b79c0
commit b38d92678d
3 changed files with 9 additions and 3 deletions

View File

@ -439,7 +439,6 @@ void TApplication::check_parameters(int & argc, char* argv[])
#ifdef DBG #ifdef DBG
else _user = "PRASSI"; else _user = "PRASSI";
#endif #endif
long twin_style = WSF_ICONIZABLE | WSF_SIZE | WSF_CLOSE; long twin_style = WSF_ICONIZABLE | WSF_SIZE | WSF_CLOSE;
if (stricmp(argv[argc-1], "-icon") == 0) if (stricmp(argv[argc-1], "-icon") == 0)
@ -450,7 +449,9 @@ void TApplication::check_parameters(int & argc, char* argv[])
else else
twin_style |= WSF_MAXIMIZED; twin_style |= WSF_MAXIMIZED;
#if XVT_OS == XVT_OS_WIN
set_value(NULL_WIN,ATTR_WIN_PM_TWIN_STARTUP_STYLE, twin_style); set_value(NULL_WIN,ATTR_WIN_PM_TWIN_STARTUP_STYLE, twin_style);
#endif
} }

View File

@ -24,11 +24,15 @@
bool TExternal_app::can_run() const bool TExternal_app::can_run() const
{ {
#if XVT_OS == XVT_OS_WIN
const TFixed_string p(_path); const TFixed_string p(_path);
const bool clifo = p.find("cg0") == 0 && p.find("-1") > 0; const bool clifo = p.find("cg0") == 0 && p.find("-1") > 0;
const int richieste = clifo ? 45 : 15; const int richieste = clifo ? 45 : 15;
const int libere = GetFreeSystemResources(GFSR_SYSTEMRESOURCES); const int libere = GetFreeSystemResources(GFSR_SYSTEMRESOURCES);
return libere >= richieste; return libere >= richieste;
#else
return TRUE;
#endif
} }

View File

@ -719,6 +719,7 @@ class TSpreadsheet : public TArray_sheet
{ {
TMask _mask; TMask _mask;
SPREADSHEET_NOTIFY _notify; SPREADSHEET_NOTIFY _notify;
TSheet_field * _owner;
TBit_array _column_disabled; TBit_array _column_disabled;
TArray _disabled; // Array di TBit_array TArray _disabled; // Array di TBit_array
@ -735,7 +736,7 @@ protected:
public: public:
TSpreadsheet(short x, short y, short dx, short dy, const char* maskname, int maskno, TSpreadsheet(short x, short y, short dx, short dy, const char* maskname, int maskno,
const char* head, WINDOW parent); const char* head, WINDOW parent, TSheet_field * o);
TArray& rows_array() const { return data(); } TArray& rows_array() const { return data(); }
@ -755,7 +756,7 @@ TSpreadsheet::TSpreadsheet(short x, short y, short dx, short dy,
const char* maskname, int maskno, const char* maskname, int maskno,
const char* head, WINDOW parent, const char* head, WINDOW parent,
TSheet_field* o) TSheet_field* o)
: TArray_sheet(x, y, dx, dy, maskname, head, 0, parent), _owner(o) : TArray_sheet(x, y, dx, dy, maskname, head, 0, parent), _owner(o),
_mask(maskname, NO_MODE, maskno), _notify(NULL) _mask(maskname, NO_MODE, maskno), _notify(NULL)
{} {}