diff options
| author | lecoanet | 2003-04-25 09:28:36 +0000 |
|---|---|---|
| committer | lecoanet | 2003-04-25 09:28:36 +0000 |
| commit | a4cbf12a3adf1d187432d0af94ad6928ea6074f2 (patch) | |
| tree | 625f86b44fd20b3eef118b1079725ac93ac89e75 /generic/tkZinc.c | |
| parent | c33722ae784a0ad6b3b5d17983e5467008665933 (diff) | |
| download | tkzinc-a4cbf12a3adf1d187432d0af94ad6928ea6074f2.zip tkzinc-a4cbf12a3adf1d187432d0af94ad6928ea6074f2.tar.gz tkzinc-a4cbf12a3adf1d187432d0af94ad6928ea6074f2.tar.bz2 tkzinc-a4cbf12a3adf1d187432d0af94ad6928ea6074f2.tar.xz | |
Correct a misalignment between the option array and
the option offsets causing core dumps and a wrong
behavior of scrollbars under Windows.
Diffstat (limited to 'generic/tkZinc.c')
| -rw-r--r-- | generic/tkZinc.c | 12 |
1 files changed, 4 insertions, 8 deletions
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; -} + } /* |