Import Tk 8.6.11
This commit is contained in:
@@ -112,7 +112,7 @@ static Tcl_Obj * GetWidgetDemoPath(Tcl_Interp *interp);
|
||||
* On OS X 10.12 we get duplicate tab control items if we create them here.
|
||||
*/
|
||||
|
||||
if ([NSApp macMinorVersion] > 12) {
|
||||
if ([NSApp macOSVersion] > 101200) {
|
||||
_defaultWindowsMenuItems = [_defaultWindowsMenuItems
|
||||
arrayByAddingObjectsFromArray:
|
||||
[NSArray arrayWithObjects:
|
||||
@@ -201,7 +201,7 @@ static Tcl_Obj * GetWidgetDemoPath(Tcl_Interp *interp);
|
||||
{
|
||||
if (!_eventInterp || !Tcl_FindCommand(_eventInterp, "tkAboutDialog",
|
||||
NULL, 0) || (GetCurrentEventKeyModifiers() & optionKey)) {
|
||||
TkAboutDlg();
|
||||
[super orderFrontStandardAboutPanel:nil];
|
||||
} else {
|
||||
int code = Tcl_EvalEx(_eventInterp, "tkAboutDialog", -1,
|
||||
TCL_EVAL_GLOBAL);
|
||||
@@ -415,7 +415,7 @@ GenerateEditEvent(
|
||||
if (!winPtr) {
|
||||
return;
|
||||
}
|
||||
tkwin = (Tk_Window) winPtr->dispPtr->focusPtr;
|
||||
tkwin = (Tk_Window)winPtr->dispPtr->focusPtr;
|
||||
if (!tkwin) {
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user