summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2017-03-13 13:43:12 (GMT)
committerfvogel <fvogelnew1@free.fr>2017-03-13 13:43:12 (GMT)
commit32b29153c1c63a7e08d4325c1fe68ae511a5ed36 (patch)
treea895b4e8ffac86c64aa7a30c2e187a67bc401fe1
parent11e3592a11d54f1f9be294b842a526a9c3c6ef67 (diff)
downloadtk-32b29153c1c63a7e08d4325c1fe68ae511a5ed36.zip
tk-32b29153c1c63a7e08d4325c1fe68ae511a5ed36.tar.gz
tk-32b29153c1c63a7e08d4325c1fe68ae511a5ed36.tar.bz2
Reorder progressbar options alphabetically (to follow the standard convention in the source code)
-rw-r--r--generic/ttk/ttkProgress.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c
index bd0b814..7787390 100644
--- a/generic/ttk/ttkProgress.c
+++ b/generic/ttk/ttkProgress.c
@@ -23,18 +23,18 @@ static const char *const ProgressbarModeStrings[] = {
};
typedef struct {
- Tcl_Obj *orientObj;
+ Tcl_Obj *anchorObj;
+ Tcl_Obj *fontObj;
+ Tcl_Obj *foregroundObj;
+ Tcl_Obj *justifyObj;
Tcl_Obj *lengthObj;
- Tcl_Obj *modeObj;
- Tcl_Obj *variableObj;
Tcl_Obj *maximumObj;
- Tcl_Obj *valueObj;
+ Tcl_Obj *modeObj;
+ Tcl_Obj *orientObj;
Tcl_Obj *phaseObj;
Tcl_Obj *textObj;
- Tcl_Obj *fontObj;
- Tcl_Obj *foregroundObj;
- Tcl_Obj *anchorObj;
- Tcl_Obj *justifyObj;
+ Tcl_Obj *valueObj;
+ Tcl_Obj *variableObj;
Tcl_Obj *wrapLengthObj;
int mode;
@@ -52,43 +52,43 @@ typedef struct {
static Tk_OptionSpec ProgressbarOptionSpecs[] =
{
- {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient",
- "horizontal", Tk_Offset(Progressbar,progress.orientObj), -1,
- 0, (ClientData)ttkOrientStrings, STYLE_CHANGED },
+ {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor",
+ "w", Tk_Offset(Progressbar,progress.anchorObj), -1,
+ TK_OPTION_NULL_OK, 0, GEOMETRY_CHANGED},
+ {TK_OPTION_FONT, "-font", "font", "Font",
+ DEFAULT_FONT, Tk_Offset(Progressbar,progress.fontObj), -1,
+ TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
+ {TK_OPTION_COLOR, "-foreground", "textColor", "TextColor",
+ "black", Tk_Offset(Progressbar,progress.foregroundObj), -1,
+ TK_OPTION_NULL_OK,0,0 },
+ {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
+ "left", Tk_Offset(Progressbar,progress.justifyObj), -1,
+ TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
{TK_OPTION_PIXELS, "-length", "length", "Length",
DEF_PROGRESSBAR_LENGTH, Tk_Offset(Progressbar,progress.lengthObj), -1,
0, 0, GEOMETRY_CHANGED },
+ {TK_OPTION_DOUBLE, "-maximum", "maximum", "Maximum",
+ "100", Tk_Offset(Progressbar,progress.maximumObj), -1,
+ 0, 0, 0 },
{TK_OPTION_STRING_TABLE, "-mode", "mode", "ProgressMode", "determinate",
Tk_Offset(Progressbar,progress.modeObj),
Tk_Offset(Progressbar,progress.mode),
0, (ClientData)ProgressbarModeStrings, 0 },
- {TK_OPTION_DOUBLE, "-maximum", "maximum", "Maximum",
- "100", Tk_Offset(Progressbar,progress.maximumObj), -1,
- 0, 0, 0 },
- {TK_OPTION_STRING, "-variable", "variable", "Variable",
- NULL, Tk_Offset(Progressbar,progress.variableObj), -1,
- TK_OPTION_NULL_OK, 0, 0 },
- {TK_OPTION_DOUBLE, "-value", "value", "Value",
- "0.0", Tk_Offset(Progressbar,progress.valueObj), -1,
- 0, 0, 0 },
+ {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient",
+ "horizontal", Tk_Offset(Progressbar,progress.orientObj), -1,
+ 0, (ClientData)ttkOrientStrings, STYLE_CHANGED },
{TK_OPTION_INT, "-phase", "phase", "Phase",
"0", Tk_Offset(Progressbar,progress.phaseObj), -1,
0, 0, 0 },
{TK_OPTION_STRING, "-text", "text", "Text", "",
Tk_Offset(Progressbar,progress.textObj), -1,
0,0,GEOMETRY_CHANGED },
- {TK_OPTION_FONT, "-font", "font", "Font",
- DEFAULT_FONT, Tk_Offset(Progressbar,progress.fontObj), -1,
- TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
- {TK_OPTION_COLOR, "-foreground", "textColor", "TextColor",
- "black", Tk_Offset(Progressbar,progress.foregroundObj), -1,
- TK_OPTION_NULL_OK,0,0 },
- {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor",
- "w", Tk_Offset(Progressbar,progress.anchorObj), -1,
- TK_OPTION_NULL_OK, 0, GEOMETRY_CHANGED},
- {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
- "left", Tk_Offset(Progressbar,progress.justifyObj), -1,
- TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
+ {TK_OPTION_DOUBLE, "-value", "value", "Value",
+ "0.0", Tk_Offset(Progressbar,progress.valueObj), -1,
+ 0, 0, 0 },
+ {TK_OPTION_STRING, "-variable", "variable", "Variable",
+ NULL, Tk_Offset(Progressbar,progress.variableObj), -1,
+ TK_OPTION_NULL_OK, 0, 0 },
{TK_OPTION_PIXELS, "-wraplength", "wrapLength", "WrapLength",
"0", Tk_Offset(Progressbar, progress.wrapLengthObj), -1,
TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED},