From 761dfe7f02f1a252eed6f5b7d34cd125f6fa3d29 Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 22 Jan 1996 11:46:48 +0000 Subject: [PATCH] Corretta set_prompt e TReal_field::set_field_data git-svn-id: svn://10.65.10.50/trunk@2484 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/maskfld.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/include/maskfld.cpp b/include/maskfld.cpp index dfac354bf..88a6e2ef9 100755 --- a/include/maskfld.cpp +++ b/include/maskfld.cpp @@ -554,12 +554,12 @@ void TMask_field::reset() // Certified 00% void TMask_field::set_prompt(const char* p) -{ - if (_promptwin != NULL_WIN) - { - word style = 0; - for (const char* s = p; *s == '@'; s++) - { +{ + WINDOW w = _promptwin != NULL_WIN ? _promptwin : _win; + + word style = 0; + for (const char* s = p; *s == '@'; s++) + { s++; switch(toupper(*s)) { @@ -567,11 +567,10 @@ void TMask_field::set_prompt(const char* p) case 'U': style |= XVT_FS_UNDERLINE; break; default : CHECKS(0, "Invalid prompt style ", s); break; } - } - if (style) - xvt_set_font(_win, "", style, CHARY-12); - xvt_vobj_set_title(_promptwin, (char*)p); - } + } + if (style) + xvt_set_font(w, "", style, CHARY-12); + xvt_vobj_set_title(w, (char*)p); } @@ -3015,7 +3014,7 @@ const char* TReal_field::get_window_data() const // Certified 100% void TReal_field::set_field_data(const char* n) { - if (*n) + if (n && *n) { real num(n); if (num.is_zero())