diff options
| -rw-r--r-- | generic/WidgetInfo.h | 2 | ||||
| -rw-r--r-- | generic/tkZinc.c | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/generic/WidgetInfo.h b/generic/WidgetInfo.h index 785a560..6779214 100644 --- a/generic/WidgetInfo.h +++ b/generic/WidgetInfo.h @@ -153,8 +153,8 @@ typedef struct _ZnWInfo { ZnBool track_manage_history; /* Tell if the tracks manage their */ /* histories. */ ZnReal speed_vector_length; /* How long (in time) are speedvectors*/ -#ifdef OM int om_group_id; /* Tell which group contains tracks to be */ +#ifdef OM ZnItem om_group; /* processed for anti label overlap. */ #endif diff --git a/generic/tkZinc.c b/generic/tkZinc.c index 4ed4a4f..23c4b47 100644 --- a/generic/tkZinc.c +++ b/generic/tkZinc.c @@ -186,10 +186,8 @@ static Tk_ConfigSpec config_specs[] = { Tk_Offset(ZnWInfo, font), 0, NULL}, {TK_CONFIG_CUSTOM, "-forecolor", "foreColor", "Foreground", "Black", Tk_Offset(ZnWInfo, fore_color), 0, &gradientOption}, -#ifndef _WIN32 {TK_CONFIG_BOOLEAN, "-fullreshape", "fullReshape", "FullReshape", "1", Tk_Offset(ZnWInfo, full_reshape), 0, NULL}, -#endif {TK_CONFIG_PIXELS, "-height", "height", "Height", "7c", Tk_Offset(ZnWInfo, opt_height), 0, NULL}, {TK_CONFIG_CUSTOM, "-highlightbackground", "highlightBackground", "HighlightBackground", @@ -212,10 +210,8 @@ static Tk_ConfigSpec config_specs[] = { {TK_CONFIG_FONT, "-maptextfont", "mapTextFont", "MapTextFont", "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*", Tk_Offset(ZnWInfo, map_text_font), 0, NULL}, -#ifdef OM {TK_CONFIG_INT, "-overlapmanager", "overlapManager", "OverlapManager", "1", Tk_Offset(ZnWInfo, om_group_id), 0, NULL}, -#endif {TK_CONFIG_INT, "-pickaperture", "pickAperture", "PickAperture", "1", Tk_Offset(ZnWInfo, pick_aperture), 0, NULL}, {TK_CONFIG_CUSTOM, "-relief", "relief", "Relief", @@ -5590,7 +5586,7 @@ Configure(Tcl_Interp *interp,/* Used for error reporting. */ #else CONST char **args2; #endif - + if (Tcl_SplitList(interp, wi->region, &argc2, &args2) != TCL_OK) { return TCL_ERROR; } @@ -5612,15 +5608,15 @@ Configure(Tcl_Interp *interp,/* Used for error reporting. */ ZnFree(args2); } } - + if (CONFIG_PROBE(SCROLL_REGION_SPEC) || CONFIG_PROBE(CONFINE_SPEC)) { SetOrigin(wi, wi->origin.x, wi->origin.y); SET(wi->flags, ZN_UPDATE_SCROLLBARS); } - + return TCL_OK; -} + } /* |