diff options
| author | fvogel <fvogelnew1@free.fr> | 2016-01-13 18:07:17 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2016-01-13 18:07:17 (GMT) |
| commit | caec41fab247510f1ed7e616ce6cfe7a2593a815 (patch) | |
| tree | 375869cab17faca3d43a067cb1c21fa0a122db73 /generic/tkListbox.c | |
| parent | cbe1741d686fd3de6be07ad51e091360d967b1ef (diff) | |
| parent | 2cabee819956e5a5b0293e228faa026d217a621a (diff) | |
| download | tk-caec41fab247510f1ed7e616ce6cfe7a2593a815.zip tk-caec41fab247510f1ed7e616ce6cfe7a2593a815.tar.gz tk-caec41fab247510f1ed7e616ce6cfe7a2593a815.tar.bz2 | |
Rebased to latest trunk
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 50f1717..490f795 100644 --- a/generic/tkListbox.c +++ b/generic/tkListbox.c @@ -290,7 +290,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}, @@ -391,7 +391,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); @@ -575,7 +575,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; } @@ -713,7 +713,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; @@ -1558,8 +1558,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; |