From 62e9ac5edfd7d9f24482ce767eec4b1ac96db4a4 Mon Sep 17 00:00:00 2001 From: Marcus Karlsson Date: Sun, 7 Oct 2012 23:21:14 +0200 Subject: [PATCH] gitk: Fix crash when not using themed widgets When configured not to use themed widgets gitk may crash on launch with a message that says that the image "bm-left disabled bm-left-gray" doesn't exist. This happens when the left and right arrow buttons are created. The crash can be avoided by configuring the buttons differently depending on whether or not themed widgets are used. If themed widgets are not used then only set the images to bm-left and bm-right respectively, and keep the old behavior when themed widgets are used. The previous behaviour was added in f062e50f to work around a bug in Tk on OS X where the disabled state did not display properly. The buttons may still not display correctly, however the workaround added in f062e50f will still apply if gitk is used with themed widgets. Make gitk not crash on launch when not using themed widgets. Signed-off-by: Marcus Karlsson Signed-off-by: Paul Mackerras --- gitk | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gitk b/gitk index d53fdb253c..54cffde721 100755 --- a/gitk +++ b/gitk @@ -2182,11 +2182,19 @@ proc makewindow {} { image create bitmap bm-right -data $bm_right_data image create bitmap bm-right-gray -data $bm_right_data -foreground "#999" - ${NS}::button .tf.bar.leftbut -image [list bm-left disabled bm-left-gray] \ - -command goback -state disabled -width 26 + ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26 + if {$use_ttk} { + .tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray] + } else { + .tf.bar.leftbut configure -image bm-left + } pack .tf.bar.leftbut -side left -fill y - ${NS}::button .tf.bar.rightbut -image [list bm-right disabled bm-right-gray] \ - -command goforw -state disabled -width 26 + ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26 + if {$use_ttk} { + .tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray] + } else { + .tf.bar.rightbut configure -image bm-right + } pack .tf.bar.rightbut -side left -fill y ${NS}::label .tf.bar.rowlabel -text [mc "Row"] -- 2.11.4.GIT