comparison src/EmacsFrame.c @ 286:57709be46d1b r21-0b41

Import from CVS: tag r21-0b41
author cvs
date Mon, 13 Aug 2007 10:35:03 +0200
parents c42ec1d1cded
children 8626e4521993
comparison
equal deleted inserted replaced
285:9a3756523c1b 286:57709be46d1b
569 q = XrmStringToQuark (lowerName); 569 q = XrmStringToQuark (lowerName);
570 570
571 toVal->size = sizeof (cvt_string_scrollbar_placement); 571 toVal->size = sizeof (cvt_string_scrollbar_placement);
572 toVal->addr = (XPointer) &cvt_string_scrollbar_placement; 572 toVal->addr = (XPointer) &cvt_string_scrollbar_placement;
573 573
574 if (q == XrmStringToQuark ("top_left")) 574 if (q == XrmStringToQuark ("top-left")
575 || q == XrmStringToQuark ("top_left"))
575 cvt_string_scrollbar_placement = XtTOP_LEFT; 576 cvt_string_scrollbar_placement = XtTOP_LEFT;
576 else if (q == XrmStringToQuark ("bottom_left")) 577 else if (q == XrmStringToQuark ("bottom-left")
578 || q == XrmStringToQuark ("bottom_left"))
577 cvt_string_scrollbar_placement = XtBOTTOM_LEFT; 579 cvt_string_scrollbar_placement = XtBOTTOM_LEFT;
578 else if (q == XrmStringToQuark ("top_right")) 580 else if (q == XrmStringToQuark ("top-right")
581 || q == XrmStringToQuark ("top_right"))
579 cvt_string_scrollbar_placement = XtTOP_RIGHT; 582 cvt_string_scrollbar_placement = XtTOP_RIGHT;
580 else if (q == XrmStringToQuark ("bottom_right")) 583 else if (q == XrmStringToQuark ("bottom-right")
584 || q == XrmStringToQuark ("bottom_right"))
581 cvt_string_scrollbar_placement = XtBOTTOM_RIGHT; 585 cvt_string_scrollbar_placement = XtBOTTOM_RIGHT;
582 else 586 else
583 { 587 {
584 XtStringConversionWarning (fromVal->addr, "scrollBarPlacement"); 588 XtStringConversionWarning (fromVal->addr, "scrollBarPlacement");
585 toVal->addr = NULL; 589 toVal->addr = NULL;