diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-10 16:08:45 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-10 16:08:45 (GMT) |
| commit | 9c45d3438d9f5eed3efe4f50c7ca96b9f978eacc (patch) | |
| tree | 18b5ad8a44b605398f07661fa992171339ba62f2 /win | |
| parent | e82adc446bb013824accb5b95f22129e0a5267a7 (diff) | |
| parent | d8043cacf61c790b4c3453014e03d4f0ea111d62 (diff) | |
| download | tk-9c45d3438d9f5eed3efe4f50c7ca96b9f978eacc.zip tk-9c45d3438d9f5eed3efe4f50c7ca96b9f978eacc.tar.gz tk-9c45d3438d9f5eed3efe4f50c7ca96b9f978eacc.tar.bz2 | |
Merge trunk
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 2 | ||||
| -rw-r--r-- | win/configure.ac | 2 | ||||
| -rw-r--r-- | win/ttkWinTheme.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/win/configure b/win/configure index fa0d3e6..79138d3 100755 --- a/win/configure +++ b/win/configure @@ -2083,7 +2083,7 @@ SHELL=/bin/sh TK_VERSION=8.7 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=7 -TK_PATCH_LEVEL="a3" +TK_PATCH_LEVEL="a4" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/configure.ac b/win/configure.ac index fa3dec3..ca9263f 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -14,7 +14,7 @@ SHELL=/bin/sh TK_VERSION=8.7 TK_MAJOR_VERSION=8 TK_MINOR_VERSION=7 -TK_PATCH_LEVEL="a3" +TK_PATCH_LEVEL="a4" VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION #------------------------------------------------------------------------ diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c index e050a71..4f90ea7 100644 --- a/win/ttkWinTheme.c +++ b/win/ttkWinTheme.c @@ -595,7 +595,7 @@ static void ThumbElementSize( (void)tkwin; (void)paddingPtr; - Ttk_GetOrientFromObj(NULL, thumbPtr->orientObj, &orient); + TtkGetOrientFromObj(NULL, thumbPtr->orientObj, &orient); if (orient == TTK_ORIENT_HORIZONTAL) { *widthPtr = GetSystemMetrics(SM_CXHTHUMB); *heightPtr = GetSystemMetrics(SM_CYHSCROLL); @@ -657,7 +657,7 @@ static void SliderElementSize( (void)tkwin; (void)paddingPtr; - Ttk_GetOrientFromObj(NULL, slider->orientObj, &orient); + TtkGetOrientFromObj(NULL, slider->orientObj, &orient); if (orient == TTK_ORIENT_HORIZONTAL) { *widthPtr = (GetSystemMetrics(SM_CXHTHUMB) / 2) | 1; *heightPtr = GetSystemMetrics(SM_CYHSCROLL); |