← Back to branch summary

~ubuntu-branches/ubuntu/wily/tk8.6/wily

« back to all changes in this revision

Viewing changes to generic/tkMenubutton.c

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2013-10-05 11:59:47 UTC
  • mfrom: (8.1.5 experimental)
  • Revision ID: package-import@ubuntu.com-20131005115947-fuy2i0zetr6iuyn3
Added the libtk8.6-dbg package with libtk8.6 debug symbols in it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
generic/tkMenubutton.c
355
355
        Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
356
356
        return TCL_ERROR;
357
357
    }
358
 
    result = Tcl_GetIndexFromObj(interp, objv[1], commandNames, "option", 0,
359
 
            &index);
 
358
    result = Tcl_GetIndexFromObjStruct(interp, objv[1], commandNames,
 
359
            sizeof(char *), "option", 0, &index);
360
360
    if (result != TCL_OK) {
361
361
        return result;
362
362
    }
436
436
 
437
437
    Tcl_DeleteCommandFromToken(mbPtr->interp, mbPtr->widgetCmd);
438
438
    if (mbPtr->textVarName != NULL) {
439
 
        Tcl_UntraceVar(mbPtr->interp, mbPtr->textVarName,
 
439
        Tcl_UntraceVar2(mbPtr->interp, mbPtr->textVarName, NULL,
440
440
                TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
441
441
                MenuButtonTextVarProc, mbPtr);
442
442
    }
506
506
     */
507
507
 
508
508
    if (mbPtr->textVarName != NULL) {
509
 
        Tcl_UntraceVar(interp, mbPtr->textVarName,
 
509
        Tcl_UntraceVar2(interp, mbPtr->textVarName, NULL,
510
510
                TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
511
511
                MenuButtonTextVarProc, mbPtr);
512
512
    }
625
625
         */
626
626
        const char *value;
627
627
 
628
 
        value = Tcl_GetVar(interp, mbPtr->textVarName, TCL_GLOBAL_ONLY);
 
628
        value = Tcl_GetVar2(interp, mbPtr->textVarName, NULL, TCL_GLOBAL_ONLY);
629
629
        if (value == NULL) {
630
 
            Tcl_SetVar(interp, mbPtr->textVarName, mbPtr->text,
 
630
            Tcl_SetVar2(interp, mbPtr->textVarName, NULL, mbPtr->text,
631
631
                    TCL_GLOBAL_ONLY);
632
632
        } else {
633
633
            if (mbPtr->text != NULL) {
636
636
            mbPtr->text = ckalloc(strlen(value) + 1);
637
637
            strcpy(mbPtr->text, value);
638
638
        }
639
 
        Tcl_TraceVar(interp, mbPtr->textVarName,
 
639
        Tcl_TraceVar2(interp, mbPtr->textVarName, NULL,
640
640
                TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
641
641
                MenuButtonTextVarProc, mbPtr);
642
642
    }
888
888
 
889
889
    if (flags & TCL_TRACE_UNSETS) {
890
890
        if ((flags & TCL_TRACE_DESTROYED) && !(flags & TCL_INTERP_DESTROYED)) {
891
 
            Tcl_SetVar(interp, mbPtr->textVarName, mbPtr->text,
 
891
            Tcl_SetVar2(interp, mbPtr->textVarName, NULL, mbPtr->text,
892
892
                    TCL_GLOBAL_ONLY);
893
 
            Tcl_TraceVar(interp, mbPtr->textVarName,
 
893
            Tcl_TraceVar2(interp, mbPtr->textVarName, NULL,
894
894
                    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
895
895
                    MenuButtonTextVarProc, clientData);
896
896
        }
897
897
        return NULL;
898
898
    }
899
899
 
900
 
    value = Tcl_GetVar(interp, mbPtr->textVarName, TCL_GLOBAL_ONLY);
 
900
    value = Tcl_GetVar2(interp, mbPtr->textVarName, NULL, TCL_GLOBAL_ONLY);
901
901
    if (value == NULL) {
902
902
        value = "";
903
903
    }