diff --git a/src/include/sheet.cpp b/src/include/sheet.cpp index 9fb37ddc1..4a5d15276 100755 --- a/src/include/sheet.cpp +++ b/src/include/sheet.cpp @@ -1140,7 +1140,7 @@ void TSheet::repos_buttons() const if (c->parent() == btnwin && c->is_kind_of(CLASS_BUTTON_FIELD)) { buttons--; - const PNT p = { y, x }; + const PNT p = { (short) y, (short) x }; xvt_rect_set_pos(&br, p); c->set_rect(br); x += space+width; @@ -1724,7 +1724,7 @@ bool TCursor_sheet::filter_dialog() default: break; } - max_len = max_len < rec.length(fname) + strlen(prompt) ? rec.length(fname) + strlen(prompt) : max_len; + max_len = max_len < rec.length(fname) + (int) strlen(prompt) ? rec.length(fname) + (int) strlen(prompt) : max_len; } max_len += 10; } diff --git a/src/include/strings.h b/src/include/strings.h index da306ddcd..7fd64fb55 100755 --- a/src/include/strings.h +++ b/src/include/strings.h @@ -663,16 +663,18 @@ public: // @cmember Toglie la stringa di posizione pos e la ritorna const char* remove(int pos); - // @cmember Ritorna il prossimo token - const char* get(); - // @cmember Ritorna un token - const char* get(int n); - // @cmember Ritorna un carattere (chiama ) + // @cmember Ritorna il prossimo token + const char* get(); + // @cmember Ritorna un token + const char* get(int n); +// @cmember Ritorna un carattere (chiama ) char get_char(int n = -1); // @cmember Ritorna un intero (chiama ) int get_int(int n = -1); // @cmember Ritorna un intero esteso (chiama ) long get_long(int n = -1); + // @cmember Ritorna un real (chiama ) + real get_real(int n = -1); // @cmember Ritorna un booleano (chiama ) bool get_bool(int n = -1);