diff options
| author | jenglish <jenglish@flightlab.com> | 2010-01-31 22:50:55 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2010-01-31 22:50:55 (GMT) |
| commit | b8c9d13aa05cbfcbbe02e7c35a467b6043128989 (patch) | |
| tree | b05e13d2fe6e468becf1ed719e0768c481dbe97d /generic/ttk/ttkProgress.c | |
| parent | 9eb9490bdd0af957334eed8ed99c60c0223d9536 (diff) | |
| download | tk-b8c9d13aa05cbfcbbe02e7c35a467b6043128989.zip tk-b8c9d13aa05cbfcbbe02e7c35a467b6043128989.tar.gz tk-b8c9d13aa05cbfcbbe02e7c35a467b6043128989.tar.bz2 | |
Change signature of widget subcommand procedures to match Tcl_ObjCmdProc.
Merge now-redundant ensemble dispatch code.
Diffstat (limited to 'generic/ttk/ttkProgress.c')
| -rw-r--r-- | generic/ttk/ttkProgress.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c index 9b64a27..679cc0b 100644 --- a/generic/ttk/ttkProgress.c +++ b/generic/ttk/ttkProgress.c @@ -1,4 +1,4 @@ -/* $Id: ttkProgress.c,v 1.8 2009/02/08 19:35:35 jenglish Exp $ +/* $Id: ttkProgress.c,v 1.9 2010/01/31 22:50:56 jenglish Exp $ * * Copyright (c) Joe English, Pat Thoyts, Michael Kirkham * @@ -393,7 +393,7 @@ static Ttk_Layout ProgressbarGetLayout( /* $sb step ?amount? */ static int ProgressbarStepCommand( - Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr) + void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { Progressbar *pb = recordPtr; double value = 0.0, stepAmount = 1.0; @@ -467,30 +467,29 @@ static int ProgressbarStartStopCommand( } static int ProgressbarStartCommand( - Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr) + void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { return ProgressbarStartStopCommand( interp, "::ttk::progressbar::start", objc, objv); } static int ProgressbarStopCommand( - Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], void *recordPtr) + void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { return ProgressbarStartStopCommand( interp, "::ttk::progressbar::stop", objc, objv); } -static WidgetCommandSpec ProgressbarCommands[] = -{ - { "configure", TtkWidgetConfigureCommand }, - { "cget", TtkWidgetCgetCommand }, - { "identify", TtkWidgetIdentifyCommand }, - { "instate", TtkWidgetInstateCommand }, - { "start", ProgressbarStartCommand }, - { "state", TtkWidgetStateCommand }, - { "step", ProgressbarStepCommand }, - { "stop", ProgressbarStopCommand }, - { NULL, NULL } +static const Ttk_Ensemble ProgressbarCommands[] = { + { "configure", TtkWidgetConfigureCommand,0 }, + { "cget", TtkWidgetCgetCommand,0 }, + { "identify", TtkWidgetIdentifyCommand,0 }, + { "instate", TtkWidgetInstateCommand,0 }, + { "start", ProgressbarStartCommand,0 }, + { "state", TtkWidgetStateCommand,0 }, + { "step", ProgressbarStepCommand,0 }, + { "stop", ProgressbarStopCommand,0 }, + { 0,0,0 } }; /* |