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

Aggiunto un valore di ritorno WINDOW ai metodi add_* di TMask

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@876 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-01-18 14:41:01 +00:00
parent 8dd13258ab
commit a7fb8fefed
4 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/mask.cpp
View File

@ -1221,53 +1221,60 @@ void TMask::set_handler(MASK_HANDLER handler)
// aggiunta campi a runtime // aggiunta campi a runtime
void TMask::add_static (short id, int page, const char* prompt, int x, WINDOW TMask::add_static (short id, int page, const char* prompt, int x,
int y, const char* flags) int y, const char* flags)
{ {
TMask_field* f = new TMask_field(this); TMask_field* f = new TMask_field(this);
f->construct(id, prompt, x, y, strlen(prompt), _pagewin[page], flags); f->construct(id, prompt, x, y, strlen(prompt), _pagewin[page], flags);
_field.add(f); _field.add(f);
return f->win();
} }
void TMask::add_string (short id, int page, const char* prompt, int x, WINDOW TMask::add_string (short id, int page, const char* prompt, int x,
int y, int dim, const char* flags, int width) int y, int dim, const char* flags, int width)
{ {
TEdit_field* f = new TEdit_field(this); TEdit_field* f = new TEdit_field(this);
f->construct(id, prompt, x, y, dim, _pagewin[page], flags, width); f->construct(id, prompt, x, y, dim, _pagewin[page], flags, width);
_field.add(f); _field.add(f);
return f->win();
} }
void TMask::add_number (short id, int page, const char* prompt, int x, WINDOW TMask::add_number (short id, int page, const char* prompt, int x,
int y, int dim, const char* flags, int ndec) int y, int dim, const char* flags, int ndec)
{ {
TReal_field* f = new TReal_field(this); TReal_field* f = new TReal_field(this);
f->construct(id, prompt, x, y, dim, _pagewin[page], flags, ndec); f->construct(id, prompt, x, y, dim, _pagewin[page], flags, ndec);
_field.add(f); _field.add(f);
return f->win();
} }
void TMask::add_date (short id, int page, const char* prompt, int x, WINDOW TMask::add_date (short id, int page, const char* prompt, int x,
int y, const char* flags) int y, const char* flags)
{ {
TDate_field* f = new TDate_field(this); TDate_field* f = new TDate_field(this);
f->construct(id, prompt, x, y, 10, _pagewin[page], flags); f->construct(id, prompt, x, y, 10, _pagewin[page], flags);
_field.add(f); _field.add(f);
return f->win();
} }
void TMask::add_button (short id, int page, const char* prompt, int x, WINDOW TMask::add_button (short id, int page, const char* prompt, int x,
int y, int dx, int dy, const char* flags) int y, int dx, int dy, const char* flags)
{ {
TButton_field* f = new TButton_field(this); TButton_field* f = new TButton_field(this);
f->construct(id, prompt, x, y, dy, _pagewin[page], flags, dx); f->construct(id, prompt, x, y, dy, _pagewin[page], flags, dx);
_field.add(f); _field.add(f);
return f->win();
} }
void TMask::add_radio(short id, int page, const char* prompt, int x,
int y, int dx, const char* codes, const char* items, const char* flags) WINDOW TMask::add_radio(short id, int page, const char* prompt, int x,
int y, int dx, const char* codes, const char* items, const char* flags)
{ {
TRadio_field* f = new TRadio_field(this); TRadio_field* f = new TRadio_field(this);
f->replace_items(codes, items); f->replace_items(codes, items);
f->construct(id, prompt, x, y, dx, _pagewin[page], flags, dx); f->construct(id, prompt, x, y, dx, _pagewin[page], flags, dx);
_field.add(f); _field.add(f);
return ((TMask_field*)f)->win();
} }
bool TMask::save(bool append) const bool TMask::save(bool append) const

25
include/mask.h
View File

@ -95,19 +95,18 @@ public:
const TFilename& source_file() const { return _source_file; } const TFilename& source_file() const { return _source_file; }
// aggiunta campi a runtime // aggiunta campi a runtime
void add_static (short id, int page, const char* prompt, int x, int y, WINDOW add_static (short id, int page, const char* prompt, int x, int y,
const char* flags = ""); const char* flags = "");
void add_string (short id, int page, const char* prompt, int x, int y, WINDOW add_string (short id, int page, const char* prompt, int x, int y,
int dim, const char* flags = "", int width = 0); int dim, const char* flags = "", int width = 0);
void add_number (short id, int page, const char* prompt, int x, int y, WINDOW add_number (short id, int page, const char* prompt, int x, int y,
int dim, const char* flags = "", int ndec = 0); int dim, const char* flags = "", int ndec = 0);
void add_date (short id, int page, const char* prompt, int x, int y, WINDOW add_date (short id, int page, const char* prompt, int x, int y,
const char* flags = ""); const char* flags = "");
void add_button (short id, int page, const char* prompt, int x, int y, WINDOW add_button (short id, int page, const char* prompt, int x, int y,
int dx = 9, int dy = 1, const char* flags = ""); int dx = 9, int dy = 1, const char* flags = "");
WINDOW add_radio(short id, int page, const char* prompt, int x, int y,
void add_radio(short id, int page, const char* prompt, int x, int y, int dx, const char* codes, const char* items, const char* flags = "");
int dx, const char* codes, const char* items, const char* flags = "");
int fields() const { return _field.items(); } int fields() const { return _field.items(); }
int sheets() const { return _sheets; } int sheets() const { return _sheets; }

16
include/maskfld.cpp
View File

@ -1,4 +1,4 @@
// $Id: maskfld.cpp,v 1.68 1995-01-16 15:10:31 guy Exp $ // $Id: maskfld.cpp,v 1.69 1995-01-18 14:40:52 guy Exp $
#include <xvt.h> #include <xvt.h>
#include <applicat.h> #include <applicat.h>
@ -1262,7 +1262,8 @@ int TBrowse::inputs()
int inp = 0; int inp = 0;
for (const char* fld = _inp_id.get(0); fld; fld = _inp_id.get()) for (const char* fld = _inp_id.get(0); fld; fld = _inp_id.get())
{ {
if (*fld != '"' && strchr(fld, '@') == NULL)
if (*fld != '"' && strchr(fld, '@') == NULL && field(atoi(fld)).is_edit())
inp++; inp++;
} }
return inp; return inp;
@ -2908,15 +2909,8 @@ const char* TList_field::get_window_data() const
void TList_field::set_field_data(const char* data) void TList_field::set_field_data(const char* data)
{ {
_str = data; const int i = str2curr(data);
if (_str.not_empty()) _str = _codes.get(i);
{
const int i = _codes.get_pos(_str);
if (i < 0)
_str = _codes.get(0);
}
else
_str = _codes.get(0);
} }
bool TList_field::on_hit() bool TList_field::on_hit()

4
include/xvtility.cpp
View File

@ -217,10 +217,6 @@ static void createwindow_hook(DWORD* exstyle, LPCSTR* classname, LPCSTR* windown
{ {
if (_wc_type == WC_EDIT) if (_wc_type == WC_EDIT)
{ {
if (_bandiere & CTL_FLAG_RIGHT_JUST)
*exstyle |= ES_MULTILINE | ES_RIGHT;
if (_bandiere & CTL_FLAG_MAC_GENEVA9)
*exstyle |= ES_UPPERCASE;
if (_bandiere & CTL_FLAG_MAC_MONACO9) if (_bandiere & CTL_FLAG_MAC_MONACO9)
*exstyle |= ES_PASSWORD; *exstyle |= ES_PASSWORD;
} }