[PATCH] git-gui: Error on systems with TK < 8.6.0

From

Peter van der Does <peter@avirtualhome.com>

Date

Mar 31, 2017, 12:54 UTC

Message-ID

<c56892f3-602c-d684-5d07-a3ce3bab8189@avirtualhome.com>

Catch the error on those systems and use a different command to check
for the current theme.
---
 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
 			}

-- 
2.12.2