diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-10 14:02:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-10 14:02:36 (GMT) |
| commit | 7186877f46e619506da6c59f98ccaa4c623a4fbe (patch) | |
| tree | 01e5d04969a82f12392a545d9eb1ac810e11a774 /generic/tkListbox.c | |
| parent | 2522c0935ba3317f2f6a19894ec0ae5fff3fcc95 (diff) | |
| parent | 2987950f24f7b2fda46de8d528a3693ccf7943b9 (diff) | |
| download | tk-7186877f46e619506da6c59f98ccaa4c623a4fbe.zip tk-7186877f46e619506da6c59f98ccaa4c623a4fbe.tar.gz tk-7186877f46e619506da6c59f98ccaa4c623a4fbe.tar.bz2 | |
Rebase to 8.6, getting rid of DEF_TEXT_SPACING[123]
Diffstat (limited to 'generic/tkListbox.c')
| -rw-r--r-- | generic/tkListbox.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/tkListbox.c b/generic/tkListbox.c index 1843bbb..95f7862 100644 --- a/generic/tkListbox.c +++ b/generic/tkListbox.c @@ -285,7 +285,7 @@ static const Tk_OptionSpec optionSpecs[] = { Tk_Offset(Listbox, selBorderWidth), 0, 0, 0}, {TK_OPTION_COLOR, "-selectforeground", "selectForeground", "Background", DEF_LISTBOX_SELECT_FG_COLOR, -1, Tk_Offset(Listbox, selFgColorPtr), - TK_CONFIG_NULL_OK, DEF_LISTBOX_SELECT_FG_MONO, 0}, + TK_OPTION_NULL_OK, DEF_LISTBOX_SELECT_FG_MONO, 0}, {TK_OPTION_STRING, "-selectmode", "selectMode", "SelectMode", DEF_LISTBOX_SELECT_MODE, -1, Tk_Offset(Listbox, selectMode), TK_OPTION_NULL_OK, 0, 0}, @@ -386,7 +386,7 @@ enum indices { static void ChangeListboxOffset(Listbox *listPtr, int offset); static void ChangeListboxView(Listbox *listPtr, int index); static int ConfigureListbox(Tcl_Interp *interp, Listbox *listPtr, - int objc, Tcl_Obj *const objv[], int flags); + int objc, Tcl_Obj *const objv[]); static int ConfigureListboxItem(Tcl_Interp *interp, Listbox *listPtr, ItemAttr *attrs, int objc, Tcl_Obj *const objv[], int index); @@ -567,7 +567,7 @@ Tk_ListboxObjCmd( return TCL_ERROR; } - if (ConfigureListbox(interp, listPtr, objc-2, objv+2, 0) != TCL_OK) { + if (ConfigureListbox(interp, listPtr, objc-2, objv+2) != TCL_OK) { Tk_DestroyWindow(listPtr->tkwin); return TCL_ERROR; } @@ -698,7 +698,7 @@ ListboxWidgetObjCmd( Tcl_SetObjResult(interp, objPtr); result = TCL_OK; } else { - result = ConfigureListbox(interp, listPtr, objc-2, objv+2, 0); + result = ConfigureListbox(interp, listPtr, objc-2, objv+2); } break; @@ -1543,8 +1543,7 @@ ConfigureListbox( register Listbox *listPtr, /* Information about widget; may or may not * already have values for some fields. */ int objc, /* Number of valid entries in argv. */ - Tcl_Obj *const objv[], /* Arguments. */ - int flags) /* Flags to pass to Tk_ConfigureWidget. */ + Tcl_Obj *const objv[]) /* Arguments. */ { Tk_SavedOptions savedOptions; Tcl_Obj *oldListObj = NULL; |