[Emc-commit] master: don't enable radiobutton / checkbutton appearance hacks on tk8.5

[Jeff E. <gi...@gi...>]

don't enable radiobutton / checkbutton appearance hacks on tk8.5

tk8.5 has a nice appearance by default, so there's no need for these
creepy workarounds


http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=d905e4f

---
 share/axis/tcl/cb.tcl |    1 +
 share/axis/tcl/rb.tcl |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/share/axis/tcl/cb.tcl b/share/axis/tcl/cb.tcl
index 54a5554..08fa3b7 100644
--- a/share/axis/tcl/cb.tcl
+++ b/share/axis/tcl/cb.tcl
@@ -97,6 +97,7 @@ proc ::cb::nicer_cb_configure {w} {
 }
 
 proc ::cb::install {} {
+    if {$::tk_version >= "8.5"} { return }
     rename ::checkbutton ::cb::real_checkbutton
     proc ::checkbutton { path args } {
         eval [concat ::cb::real_checkbutton $path $args]
diff --git a/share/axis/tcl/rb.tcl b/share/axis/tcl/rb.tcl
index 0ea6c74..abfdf11 100644
--- a/share/axis/tcl/rb.tcl
+++ b/share/axis/tcl/rb.tcl
@@ -110,6 +110,7 @@ proc ::rb::nicer_rb_configure {w} {
 # button is at [winfo width $w]-[winfo reqwidth $w]
 
 proc ::rb::install {} {
+    if {$::tk_version >= "8.5"} { return }
     rename ::radiobutton ::rb::real_radiobutton
     proc ::radiobutton { path args } {
         eval [concat ::rb::real_radiobutton $path $args]