diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-05-11 23:24:15 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-05-11 23:24:15 (GMT) |
commit | 5c8f06b4fd10909dce43f80fbb67e2c1deddb26a (patch) | |
tree | 76bdcd090bb25d2a512abf6d8aebafdd5d49cbd5 /generic/ttk/ttkElements.c | |
parent | caa2d058af16a9fedfd454550c9fc195131bda31 (diff) | |
download | tk-5c8f06b4fd10909dce43f80fbb67e2c1deddb26a.zip tk-5c8f06b4fd10909dce43f80fbb67e2c1deddb26a.tar.gz tk-5c8f06b4fd10909dce43f80fbb67e2c1deddb26a.tar.bz2 |
Two more Tk_GetPixelsFromObj usages. Remove double MODULE_SCOPE definitions. All backported
Diffstat (limited to 'generic/ttk/ttkElements.c')
-rw-r--r-- | generic/ttk/ttkElements.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c index 543429b..f136a21 100644 --- a/generic/ttk/ttkElements.c +++ b/generic/ttk/ttkElements.c @@ -299,7 +299,7 @@ static Ttk_ElementOptionSpec PaddingElementOptions[] = { Tk_Offset(PaddingElement,paddingObj), "0" }, { "-relief", TK_OPTION_RELIEF, Tk_Offset(PaddingElement,reliefObj), "flat" }, - { "-shiftrelief", TK_OPTION_INT, + { "-shiftrelief", TK_OPTION_PIXELS, Tk_Offset(PaddingElement,shiftreliefObj), "0" }, { NULL, 0, 0, NULL } }; @@ -314,7 +314,7 @@ static void PaddingElementSize( Ttk_Padding pad; Tk_GetReliefFromObj(NULL, padding->reliefObj, &relief); - Tcl_GetIntFromObj(NULL, padding->shiftreliefObj, &shiftRelief); + Tk_GetPixelsFromObj(NULL, tkwin, padding->shiftreliefObj, &shiftRelief); Ttk_GetPaddingFromObj(NULL,tkwin,padding->paddingObj,&pad); *paddingPtr = Ttk_RelievePadding(pad, relief, shiftRelief); } @@ -1529,8 +1529,8 @@ static Ttk_ElementSpec ClientElementSpec = { * Register default element implementations. */ -MODULE_SCOPE -void TtkElements_Init(Tcl_Interp *interp) +MODULE_SCOPE void +TtkElements_Init(Tcl_Interp *interp) { Ttk_Theme theme = Ttk_GetDefaultTheme(interp); |