diff options
| author | hobbs <hobbs> | 2002-09-09 23:52:02 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2002-09-09 23:52:02 (GMT) |
| commit | 958042034bbbe215fbb0915cf6c07b9914923724 (patch) | |
| tree | 804bf93151524b4ec43b4495c97883b3f0b0d9d8 /macosx/tkMacOSXWm.c | |
| parent | ec6a4daee7df6a5652185b52f34a9e48d28a652e (diff) | |
| download | tk-958042034bbbe215fbb0915cf6c07b9914923724.zip tk-958042034bbbe215fbb0915cf6c07b9914923724.tar.gz tk-958042034bbbe215fbb0915cf6c07b9914923724.tar.bz2 | |
* library/tk.tcl: use command instead of control on Aqua bindings.
Force dialogs to appear below fixed native Mac menubar.
* macosx/tkMacOSXKeyEvent.c:
* macosx/tkMacOSXKeyboard.c: Keypress/release events for pure
modifier keys were not being passed to Tk.
Deadkey presses were inserting null characters into text windows.
Now they do nothing. (Still not ideal, but better than before!)
* macosx/tkMacOSXMenu.c: Allow more than 200 menus to exist -
increased to 2000.
* macosx/tkMacOSXMouseEvent.c: Bad interactions between floating
windows and ordinary ones. Ensure that local<->global coordinate
transformations are wrt to the correct window.
* macosx/tkMacOSXWm.c: Better error msg for 'wm attributes'.
Remove crash in 'wm transient'.
Add 'noActivates' and 'noUpdates' flags to unsupported command.
[Patch #606658] (darley)
Diffstat (limited to 'macosx/tkMacOSXWm.c')
| -rw-r--r-- | macosx/tkMacOSXWm.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index 14f93fb..633e305 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXWm.c,v 1.3 2002/09/03 11:48:56 vincentdarley Exp $ + * RCS: @(#) $Id: tkMacOSXWm.c,v 1.4 2002/09/09 23:52:02 hobbs Exp $ */ #include <Carbon/Carbon.h> @@ -763,6 +763,7 @@ configArgs: Tcl_AppendResult(interp, "wrong # arguments: must be \"", Tcl_GetStringFromObj (objv[0], NULL), " attributes window", " ?-modified ?bool??", + " ?-titlepath ?path??", "\"", (char *) NULL); return TCL_ERROR; } @@ -2544,7 +2545,8 @@ Tcl_Obj *CONST objv[]; /* Argument objects. */ wmPtr2 = ((TkWindow *) master)->wmInfoPtr; - if (wmPtr2->iconFor != NULL) { + /* Under some circumstances, wmPtr2 is NULL here */ + if (wmPtr2 != NULL && wmPtr2->iconFor != NULL) { Tcl_AppendResult(interp, "can't make \"", Tcl_GetString(objv[3]), "\" a master: it is an icon for ", @@ -4755,6 +4757,14 @@ TkUnsupported1Cmd( } else if ((*attrArgv[i] == 's') && (strcmp(attrArgv[i], "sideTitlebar") == 0)) { wmPtr->attributes |= kWindowSideTitlebarAttribute; + foundOne = 1; + } else if ((*attrArgv[i] == 'n') + && (strcmp(attrArgv[i], "noActivates") == 0)) { + wmPtr->attributes |= kWindowNoActivatesAttribute; + foundOne = 1; + } else if ((*attrArgv[i] == 'n') + && (strcmp(attrArgv[i], "noUpdates") == 0)) { + wmPtr->attributes |= kWindowNoUpdatesAttribute; foundOne = 1; } else { foundOne = 0; |