@matheusbsbs / matheus-bagliano / commits / 62e9ac5edf

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 <mk@acc.umu.se> Signed-off-by: Paul Mackerras <paulus@samba.org>

Marcus Karlsson committed Oct 7, 2012 at 23:21 UTC 62e9ac5edfd7d9f24482ce767eec4b1ac96db4a4
1 file changed +12 -4
gitk
+12 -4
@@ -2182,11 +2182,19 @@ proc makewindow {} {
2182 image create bitmap bm-right -data $bm_right_data
2183 image create bitmap bm-right-gray -data $bm_right_data -foreground "#999"
2184
2185 - ${NS}::button .tf.bar.leftbut -image [list bm-left disabled bm-left-gray] \
2186 - -command goback -state disabled -width 26
2185 + ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26
2186 + if {$use_ttk} {
2187 + .tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray]
2188 + } else {
2189 + .tf.bar.leftbut configure -image bm-left
2190 + }
2191 pack .tf.bar.leftbut -side left -fill y
2188 - ${NS}::button .tf.bar.rightbut -image [list bm-right disabled bm-right-gray] \
2189 - -command goforw -state disabled -width 26
2192 + ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26
2193 + if {$use_ttk} {
2194 + .tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray]
2195 + } else {
2196 + .tf.bar.rightbut configure -image bm-right
2197 + }
2198 pack .tf.bar.rightbut -side left -fill y
2199
2200 ${NS}::label .tf.bar.rowlabel -text [mc "Row"]