Fix missed Tcl9/tk9 problems and tkinter interaction.

Author: BsAtHome

lib/python/rs274/OpenGLTk.py

@@ -380,8 +380,8 @@ def tkPrint(self, file):
         self.activate()
 
     def zoomwheel(self, event):
-        if event.delta > 0: self.zoomin(event)
-        else: self.zoomout(event)
+        if event.delta > 0: self.zoomin()
+        else: self.zoomout()
 
     def tkStartZoom(self, event):
         self.startZoom(event.y)

src/emc/usr_intf/axis/extensions/togl.c

@@ -1057,7 +1057,7 @@ int Togl_Configure(Tcl_Interp *interp, struct Togl *togl,
    int oldStencilSize = togl->StencilSize;
    int oldAuxNumber   = togl->AuxNumber;
 
-#if TCL_MAJOR_VERSION >= 9
+#if TK_MAJOR_VERSION >= 9
    // Version 9+ uses Tcl_Obj* array as config whereas older uses a char* array
    Tcl_Obj **optr = calloc(argc+1, sizeof(*optr));  // argc+1 to terminate list with a NULL pointer
    for(int u = 0; u < argc; u++) {
@@ -1070,7 +1070,7 @@ int Togl_Configure(Tcl_Interp *interp, struct Togl *togl,
                           argc, (void *)optr, (char *)togl, flags) == TCL_ERROR) {
       return(TCL_ERROR);
    }
-#if TCL_VERSION_MAJOR >= 9
+#if TK_VERSION_MAJOR >= 9
    for(int u = 0; u < argc; u++) {
       Tcl_DecrRefCount(optr[u]);
    }

src/emc/usr_intf/axis/scripts/axis.py

@@ -1660,7 +1660,7 @@ def __init__(self, title, text, default, unit_str=''):
         self.buttons = f = Tkinter.Frame(t)
         self.ok = Tkinter.Button(f, text=_("OK"), command=self.do_ok, width=10,height=1,padx=0,pady=.25, default="active")
         self.cancel = Tkinter.Button(f, text=_("Cancel"), command=self.do_cancel, width=10,height=1,padx=0,pady=.25, default="normal")
-        v.trace("w", self.check_valid)
+        v.trace_add("write", self.check_valid)
         t.wm_protocol("WM_DELETE_WINDOW", self.cancel.invoke)
         t.bind("<Return>", lambda event: (self.ok.flash(), self.ok.invoke()))
         t.bind("<KP_Enter>", lambda event: (self.ok.flash(), self.ok.invoke()))
@@ -1769,7 +1769,7 @@ def __init__(self, title, text_pattern, default, tool_only, defaultsystem):
         f = Frame(t)
         self.c = c = StringVar(t)
         c.set(defaultsystem)
-        c.trace_variable("w", self.change_system)
+        c.trace_add("write", self.change_system)
         if not tool_only:
             l = Label(f, text=_("Coordinate System:"))
             mb = OptionMenu(f, c, *systems)