The R Project SVN R

Rev

Rev 38332 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 38332 Rev 39274
Line 767... Line 767...
767 
 
 767 
 
768 
    *bufp = '\0';
 768 
    *bufp = '\0';
769 
 
 769 
 
770 
    if (CellModified || CellEditable) {
 770 
    if (CellModified || CellEditable) {
771 
	if (CellEditable) {
 771 
	if (CellEditable) {
772 
	    strncpy(buf, gettext(celledit), BUFSIZE-1);
 772 
	    strncpy(buf, GA_gettext(celledit), BUFSIZE-1);
773 
	    clength = strlen(buf);
 773 
	    clength = strlen(buf);
774 
	    hide(celledit);
 774 
	    hide(celledit);
775 
	    del(celledit);
 775 
	    del(celledit);
776 
	}
 776 
	}
777 
	getccol();
 777 
	getccol();
Line 1344... Line 1344...
1344 
{
 1344 
{
1345 
    SEXP tvec;
 1345 
    SEXP tvec;
1346 
    char buf[BUFSIZE], clab[25];
 1346 
    char buf[BUFSIZE], clab[25];
1347 
    int i;
 1347 
    int i;
1348 
    buf[BUFSIZE-1] = '\0';
 1348 
    buf[BUFSIZE-1] = '\0';
1349 
    strncpy(buf, gettext(varname), BUFSIZE-1);
 1349 
    strncpy(buf, GA_gettext(varname), BUFSIZE-1);
1350 
    if(!strlen(buf)) {
 1350 
    if(!strlen(buf)) {
1351 
	askok(G_("column names cannot be blank"));
 1351 
	askok(G_("column names cannot be blank"));
1352 
	return;
 1352 
	return;
1353 
    }
 1353 
    }
1354 
    if (popupcol > xmaxused) {
 1354 
    if (popupcol > xmaxused) {
Line 1471... Line 1471...
1471 
 
 1471 
 
1472 
static void vw_close(control c)
 1472 
static void vw_close(control c)
1473 
{
 1473 
{
1474 
    int x;
 1474 
    int x;
1475 
    if (ischecked(varwidths)) x = 0;
 1475 
    if (ischecked(varwidths)) x = 0;
1476 
    else x = atoi(gettext(varname)); /* 0 if error */
 1476 
    else x = atoi(GA_gettext(varname)); /* 0 if error */
1477 
    x = min(x, 50);
 1477 
    x = min(x, 50);
1478 
    if (x != nboxchars) {
 1478 
    if (x != nboxchars) {
1479 
	nboxchars = x;
 1479 
	nboxchars = x;
1480 
	box_w = ((nboxchars >0)?nboxchars:FIELDWIDTH)*FW + 8;
 1480 
	box_w = ((nboxchars >0)?nboxchars:FIELDWIDTH)*FW + 8;
1481 
	deredraw();
 1481 
	deredraw();