Tk Source Code

Check-in [abff3a1d]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
or submit via the online form by Sep 9.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix the build after previous commit
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | revised_text | tip-466
Files: files | file ages | folders
SHA3-256: abff3a1d2b15e147276eee8c317646abb27af251696e06decc02433140ff9010
User & Date: fvogel 2019-01-12 16:56:53
References
2019-04-17
20:28 New ticket [0b9dc76e] revised_text: text-32.4 fails (recent regression). artifact: a5db0fe7 user: fvogel
Context
2019-01-20
21:12
merge-mark check-in: 50facf3b user: jan.nijtmans tags: revised_text, tip-466
2019-01-12
16:56
Fix the build after previous commit check-in: abff3a1d user: fvogel tags: revised_text, tip-466
2019-01-10
12:27
Merge trunk check-in: 98493932 user: jan.nijtmans tags: revised_text, tip-466
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tkConfig.c.

799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
....
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
	Tk_Cursor newCursor;

	if (nullOK && ObjectIsEmpty(valuePtr)) {
	    newCursor = NULL;
	    valuePtr = NULL;
	} else {
	    newCursor = Tk_AllocCursorFromObj(interp, tkwin, valuePtr);
	    if (newCursor == None) {
		return TCL_ERROR;
	    }
	}
	if (internalPtr != NULL) {
	    *((Tk_Cursor *) oldInternalPtr) = *((Tk_Cursor *) internalPtr);
	    *((Tk_Cursor *) internalPtr) = newCursor;
	}
................................................................................
       }
       case TK_OPTION_RELIEF:
	   objPtr = Tcl_NewStringObj(Tk_NameOfRelief(*((int *) internalPtr)), -1);
	   break;
       case TK_OPTION_CURSOR: {
	   Tk_Cursor cursor = *((Tk_Cursor *) internalPtr);

	   if (cursor != None) {
	       objPtr = Tcl_NewStringObj(
		       Tk_NameOfCursor(Tk_Display(tkwin), cursor), -1);
	   }
	   break;
       }
       case TK_OPTION_JUSTIFY:
	   objPtr = Tcl_NewStringObj(Tk_NameOfJustify(






|







 







|







799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
....
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
	Tk_Cursor newCursor;

	if (nullOK && ObjectIsEmpty(valuePtr)) {
	    newCursor = NULL;
	    valuePtr = NULL;
	} else {
	    newCursor = Tk_AllocCursorFromObj(interp, tkwin, valuePtr);
	    if (newCursor == NULL) {
		return TCL_ERROR;
	    }
	}
	if (internalPtr != NULL) {
	    *((Tk_Cursor *) oldInternalPtr) = *((Tk_Cursor *) internalPtr);
	    *((Tk_Cursor *) internalPtr) = newCursor;
	}
................................................................................
       }
       case TK_OPTION_RELIEF:
	   objPtr = Tcl_NewStringObj(Tk_NameOfRelief(*((int *) internalPtr)), -1);
	   break;
       case TK_OPTION_CURSOR: {
	   Tk_Cursor cursor = *((Tk_Cursor *) internalPtr);

	   if (cursor != NULL) {
	       objPtr = Tcl_NewStringObj(
		       Tk_NameOfCursor(Tk_Display(tkwin), cursor), -1);
	   }
	   break;
       }
       case TK_OPTION_JUSTIFY:
	   objPtr = Tcl_NewStringObj(Tk_NameOfJustify(