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

mailbox.cpp corretti alcuni CHECK e sostiuiti con NFCHECK

Browse Source 
mask.cpp      aggiunta clessidra durante i check iniziali
rectypes.h    corretto commento errato
relapp.cpp    corretto messaggio di errore di lock
sheet.cpp     aggiunto #include<config.h>
sort.cpp      falso allarme
strings.cpp   corretta add dei TString_array
xvtility.cpp  spostata #ifdef CTL3d che scazzava il NOMUNGE
xvtility.h    Aggiunta class TWaitCursor


git-svn-id: svn://10.65.10.50/trunk@4231 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1997-03-24 16:51:54 +00:00
parent e2d72a6463
commit c996099caf
9 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/mailbox.cpp
View File

@ -167,7 +167,7 @@ void TMailbox::send(TMessage& m)
void TMailbox::sendcmd(int argc, char* argv[], char* to)
{
CHECK(0,"MAILBOX::COMMANDLINE INTERFACE NOT IMPLEMENTED");
NFCHECK("MAILBOX::COMMANDLINE INTERFACE NOT IMPLEMENTED");
for (int i = 0; i < argc; i++)
{
// parse argv[i]
@ -179,7 +179,7 @@ void TMailbox::sendcmd(int argc, char* argv[], char* to)
char* TMailbox::readcmd(char*)
{
// filters all messages to recipient and adds to to_path
CHECK(0,"MAILBOX::COMMANDLINE INTERFACE NOT IMPLEMENTED");
NFCHECK("MAILBOX::COMMANDLINE INTERFACE NOT IMPLEMENTED");
// TMessage* m;
return "NOT YET IMPLEMENTED";
}
@ -190,7 +190,6 @@ TMailbox::TMailbox(const char* appname) : _msgs(DEF_MSGS_CAPACITY)
appname = main_app().name(); // myself; must be global
_path.tempdir();
// strcpy(_path, getenv("TMPDIR") == NULL ? MAILDIR : getenv("TMPDIR"));
_path << "/" << appname << ".mbx";
_lastread =0; _lastpos = 0l;

4
include/mask.cpp
View File

@ -403,7 +403,9 @@ void TMask::start_run()
const int max = fields();
if (_should_check)
{
{
TWait_cursor hourglass;
load_checks();
for (int i = 0; i < max; i++)

2
include/rectypes.h
View File

@ -93,7 +93,7 @@ enum TIsamerr {
_isnotcurr = 221, // @emem Non esiste il record corrente
_isalropen = 222, // @emem File gia' aperto
_isdeadlock = 223, // @emem Condizione di deadlock
_isreinsert = 224, // @emem Chiva duplicata su indici diversi da 1
_isreinsert = 224, // @emem Chiave duplicata su indici diversi da 1
_islocked = 225} ; // @emem Record bloccato
typedef long TRecnotype;

7
include/relapp.cpp
View File

@ -95,8 +95,9 @@ void TRelation_application::set_limits(
bool TRelation_application::create()
{
TApplication::create();
const bool ok = user_create();
bool ok = TApplication::create();
if (ok)
ok = user_create();
if (ok)
{
write_enable();
@ -352,7 +353,7 @@ bool TRelation_application::modify_mode()
if (err != NOERR)
{
if (err == _islocked)
message_box("I dati sono gia' in uso ad un altro programma");
message_box("I dati sono gia' usati da un altro programma");
else
error_box("Impossibile leggere i dati: errore %d", err);
query_mode();

19
include/sheet.cpp
View File

@ -1,4 +1,5 @@
#include <colors.h>
#include <config.h>
#include <controls.h>
#include <maskfld.h>
#include <relation.h>
@ -589,14 +590,14 @@ void TSheet_control::load_columns_order(const TMask_field& field)
void TSheet_control::align_column(int c, bool right)
{
XI_OBJ* column = find_column(c);
CHECK(column, "Can't find numeric column");
dword attr = xi_get_attrib(column);
if (right)
attr |= XI_ATR_RJUST;
else
attr &= ~XI_ATR_RJUST;
xi_set_attrib(column, attr);
_type[c] = right ? 'R' : ' ';
CHECK(column, "Can't find numeric column");
dword attr = xi_get_attrib(column);
if (right)
attr |= XI_ATR_RJUST;
else
attr &= ~XI_ATR_RJUST;
xi_set_attrib(column, attr);
_type[c] = right ? 'R' : ' ';
}
void TSheet_control::set_columns_order(TToken_string* order)
@ -1222,7 +1223,7 @@ TCursor_sheet::TCursor_sheet(TCursor* cursor, const char* fields,
{
byte c = sheet().column_type(campo);
if (c == ' ')
sheet().align_column(campo, TRUE);
sheet().align_column(campo, TRUE);
}
}
}

1
include/sort.cpp
View File

@ -99,7 +99,6 @@ void TSort::addsortkey(
void TSort::addsortkey(TRecfield& f, char direction)
{
CHECK(f.pos() != NULL, "Invalid sort key");
_sortvar->s_fld[nsortkey].f_pos = (f.pos() - f.record().string()) + 1;

2
include/strings.cpp
View File

@ -1478,7 +1478,7 @@ int TString_array::add(const char* s, int n)
int TString_array::add(const TToken_string& s, int n)
{
if (objptr(n) == NULL)
n = TArray::add(s);
n = TArray::add(s, n);
else
row(n) = s;
return n;

3
include/xvtility.cpp
View File

@ -638,9 +638,8 @@ void customize_controls(
if (on)
{
#if XVT_OS == XVT_OS_WIN
#ifndef ATTR_WIN_USE_CTL3D
HInstance = (HINSTANCE)xvt_vobj_get_attr(NULL_WIN, ATTR_WIN_INSTANCE);
#ifndef ATTR_WIN_USE_CTL3D
Ctl3dRegister(HInstance);
Ctl3dAutoSubclass(HInstance);
#endif

8
include/xvtility.h
View File

@ -52,6 +52,14 @@ WINDOW xvt_create_window
void begin_wait();
void end_wait();
// One-liner for waiting!
class TWait_cursor
{
public:
TWait_cursor() { ::begin_wait(); }
~TWait_cursor() { ::end_wait(); }
};
void xvt_set_font(WINDOW win, const char* family, int style, int dim = 0);
bool xvt_test_menu_tag(MENU_TAG tag);