Peter van der Does <pe...@avirtualhome.com> writes:
> Using git-gui on systems that run a TK version below 8.6.0 results in a
> crash when checking for the current theme.
>
> Catch the error on those systems and use a different command to check
> for the current theme.
> ---
Needs sign-off. Also if you can make the patch against the git-gui
project (the upstream project for this part of our tree, which has
this file at lib/themed.tcl, not at git-gui/lib/themed.tcl) and send
it to its maintainer (Cc'ed), it would be great.
Thanks.
> git-gui/lib/themed.tcl | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/git-gui/lib/themed.tcl b/git-gui/lib/themed.tcl
> index 351a712c8..bb4e8f25e 100644
> --- a/git-gui/lib/themed.tcl
> +++ b/git-gui/lib/themed.tcl
> @@ -248,7 +248,11 @@ proc tspinbox {w args} {
> proc ttext {w args} {
> global use_ttk
> if {$use_ttk} {
> - switch -- [ttk::style theme use] {
> + # Handle either current Tk or older versions of 8.5
> + if {[catch {set theme [ttk::style theme use]}]} {
> + set theme $::ttk::currentTheme
> + }
> + switch -- $theme {
> "vista" - "xpnative" {
> lappend args -highlightthickness 0 -borderwidth > 0
> }
