diff options
author | jenglish <jenglish@flightlab.com> | 2008-11-09 23:53:09 (GMT) |
---|---|---|
committer | jenglish <jenglish@flightlab.com> | 2008-11-09 23:53:09 (GMT) |
commit | 382e7dcaf6581b63580d15affc7ac2f66c4ad712 (patch) | |
tree | 438838c4ce7d1162b72cf87cab54837316c5aa34 /generic/ttk/ttkEntry.c | |
parent | 8790cbda7d404e9f8bc351d5349f0ef327575cf9 (diff) | |
download | tk-382e7dcaf6581b63580d15affc7ac2f66c4ad712.zip tk-382e7dcaf6581b63580d15affc7ac2f66c4ad712.tar.gz tk-382e7dcaf6581b63580d15affc7ac2f66c4ad712.tar.bz2 |
Ttk widget initializeProc()s now return void instead of
a status code, and are no longer allowed to fail.
(Fix for #2207435 in progress).
Diffstat (limited to 'generic/ttk/ttkEntry.c')
-rw-r--r-- | generic/ttk/ttkEntry.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c index 813cd7d..ce07ed9 100644 --- a/generic/ttk/ttkEntry.c +++ b/generic/ttk/ttkEntry.c @@ -1,5 +1,5 @@ /* - * $Id: ttkEntry.c,v 1.11 2008/11/03 22:20:22 nijtmans Exp $ + * $Id: ttkEntry.c,v 1.12 2008/11/09 23:53:09 jenglish Exp $ * * DERIVED FROM: tk/generic/tkEntry.c r1.35. * @@ -935,7 +935,7 @@ EntryEventProc(ClientData clientData, XEvent *eventPtr) * +++ Initialization and cleanup. */ -static int +static void EntryInitialize(Tcl_Interp *interp, void *recordPtr) { Entry *entryPtr = recordPtr; @@ -960,8 +960,6 @@ EntryInitialize(Tcl_Interp *interp, void *recordPtr) entryPtr->entry.insertPos = 0; entryPtr->entry.selectFirst = -1; entryPtr->entry.selectLast = -1; - - return TCL_OK; } static void @@ -1827,13 +1825,13 @@ static Tk_OptionSpec ComboboxOptionSpecs[] = /* ComboboxInitialize -- * Initialization hook for combobox widgets. */ -static int +static void ComboboxInitialize(Tcl_Interp *interp, void *recordPtr) { Combobox *cb = recordPtr; TtkTrackElementState(&cb->core); ValuesInitialize(interp, recordPtr); - return EntryInitialize(interp, recordPtr); + EntryInitialize(interp, recordPtr); } /* ComboboxConfigure -- @@ -1941,14 +1939,14 @@ static Tk_OptionSpec SpinboxOptionSpecs[] = * Initialization hook for spinbox widgets. */ -static int +static void SpinboxInitialize(Tcl_Interp *interp, void *recordPtr) { Spinbox *sbPtr = recordPtr; sbPtr->spinbox.valueCount = 0; TtkTrackElementState(&sbPtr->core); ValuesInitialize(interp, recordPtr); - return EntryInitialize(interp, recordPtr); + EntryInitialize(interp, recordPtr); } /* |