summaryrefslogtreecommitdiffstats
path: root/mac/tkMacWm.c
diff options
context:
space:
mode:
authordas <das>2002-10-09 11:56:25 (GMT)
committerdas <das>2002-10-09 11:56:25 (GMT)
commit4278227fc8a6be392dcdaeeb74167fd1197e50ed (patch)
tree7a0531085231adfb4afeee1749324d002f0e35c2 /mac/tkMacWm.c
parent8cbbdb18b55a4c0123e7c195f078bfe52e27f2a4 (diff)
downloadtk-4278227fc8a6be392dcdaeeb74167fd1197e50ed.zip
tk-4278227fc8a6be392dcdaeeb74167fd1197e50ed.tar.gz
tk-4278227fc8a6be392dcdaeeb74167fd1197e50ed.tar.bz2
* generic/tkInt.decls(tkIntXlib): added XQueryTree declaration for
mac & aqua, since it's now called from ParentXId via Tk_HandleEvent. * generic/tkIntXlibDecls.h: * generic/tkStubInit.c: regen. * mac/tkMacXStubs.c: added XQueryTree stub * mac/tkMacEmbed.c (TkpUseWindow): check that container window has -container option set (sync with other platforms). * mac/tkMacBitmap.c: * mac/tkMacFont.c: * mac/tkMacSend.c: * mac/tkMacTest.c: * mac/tkMacWm.c: CONSTification. * mac/tkMacProjects.sea.hqx: added tkStyle.c and tkUndo.c to tk library projects.
Diffstat (limited to 'mac/tkMacWm.c')
-rw-r--r--mac/tkMacWm.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mac/tkMacWm.c b/mac/tkMacWm.c
index c21fb85..08e4901 100644
--- a/mac/tkMacWm.c
+++ b/mac/tkMacWm.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacWm.c,v 1.22 2002/08/31 06:12:28 das Exp $
+ * RCS: @(#) $Id: tkMacWm.c,v 1.23 2002/10/09 11:57:01 das Exp $
*/
#include <Gestalt.h>
@@ -589,7 +589,7 @@ TkWmMapWindow(
if (!Tk_IsEmbedded(winPtr)) {
TkSetWMName(winPtr, ((wmPtr->title != NULL) ?
- wmPtr->title : winPtr->nameUid);
+ wmPtr->title : winPtr->nameUid));
}
TkWmSetClass(winPtr);
@@ -1626,7 +1626,7 @@ WmIconbitmapCmd(tkwin, winPtr, interp, objc, objv)
}
if (objc == 3) {
if (wmPtr->hints.flags & IconPixmapHint) {
- Tcl_SetResult(interp,
+ Tcl_SetResult(interp, (char *)
Tk_NameOfBitmap(winPtr->display, wmPtr->hints.icon_pixmap),
TCL_STATIC);
}
@@ -1740,7 +1740,7 @@ WmIconmaskCmd(tkwin, winPtr, interp, objc, objv)
}
if (objc == 3) {
if (wmPtr->hints.flags & IconMaskHint) {
- Tcl_SetResult(interp,
+ Tcl_SetResult(interp, (char *)
Tk_NameOfBitmap(winPtr->display, wmPtr->hints.icon_mask),
TCL_STATIC);
}
@@ -2645,7 +2645,7 @@ WmTitleCmd(tkwin, winPtr, interp, objc, objv)
return TCL_ERROR;
}
if (objc == 3) {
- Tcl_SetResult(interp,
+ Tcl_SetResult(interp, (char *)
((wmPtr->title != NULL) ? wmPtr->title : winPtr->nameUid),
TCL_STATIC);
return TCL_OK;
@@ -4663,7 +4663,7 @@ TkMacGrowToplevel(
void
TkSetWMName(
TkWindow *winPtr,
- char *title)
+ CONST char *title)
{
Str255 pTitle;
GWorldPtr macWin;