From ffc085f2a956358cb283893dde39b7b729ac68bd Mon Sep 17 00:00:00 2001
From: "dgp@users.sourceforge.net" <dgp>
Date: Mon, 5 Aug 2002 14:01:14 +0000
Subject: * win/tkWinFont.c: Additional changes to fix CONST
warnings on * win/tkWinWM.c: Windows due to latest patch. Tks
Vince Darley.
---
ChangeLog | 3 +++
win/tkWinFont.c | 4 ++--
win/tkWinWm.c | 10 +++++-----
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dd3f305..50660c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2002-08-05 Don Porter <dgp@users.sf.net>
+ * win/tkWinFont.c: Additional changes to fix CONST warnings on
+ * win/tkWinWM.c: Windows due to latest patch. Tks Vince Darley.
+
* doc/3DBorder.3: Applied companion patch for Tcl Patch 585105,
* doc/BindTable.3: updating Tk to use Tcl 8.4's fully CONST-ified
* doc/ConfigWidg.3: interface, and fully CONSTifying Tk at the
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index c6111c8..87a7e82 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.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: tkWinFont.c,v 1.15 2002/04/12 07:18:49 hobbs Exp $
+ * RCS: @(#) $Id: tkWinFont.c,v 1.16 2002/08/05 14:01:15 dgp Exp $
*/
#include "tkWinInt.h"
@@ -352,7 +352,7 @@ TkpGetFontFromAttributes(
Window window;
WinFont *fontPtr;
char ***fontFallbacks;
- char *faceName, *fallback, *actualName;
+ Tk_Uid faceName, fallback, actualName;
tkwin = (Tk_Window) ((TkWindow *) tkwin)->mainPtr->winPtr;
window = Tk_WindowId(tkwin);
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index c2e56ff..22996e9 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.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: tkWinWm.c,v 1.50 2002/07/25 21:35:22 pspjuth Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.51 2002/08/05 14:01:15 dgp Exp $
*/
#include "tkWinInt.h"
@@ -3387,7 +3387,7 @@ WmIconbitmapCmd(tkwin, winPtr, interp, objc, objv)
} else if (objc == 3) {
/* No arguments were given */
if (wmPtr->hints.flags & IconPixmapHint) {
- Tcl_SetResult(interp,
+ Tcl_SetResult(interp, (char *)
Tk_NameOfBitmap(winPtr->display, wmPtr->hints.icon_pixmap),
TCL_STATIC);
}
@@ -3556,7 +3556,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);
}
@@ -4503,7 +4503,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;
@@ -5609,7 +5609,7 @@ TkWmProtocolEventProc(winPtr, eventPtr)
* Cache atom name, as we might destroy the window as a
* result of the eval.
*/
- char *name = Tk_GetAtomName((Tk_Window) winPtr, protocol);
+ CONST char *name = Tk_GetAtomName((Tk_Window) winPtr, protocol);
Tcl_Preserve((ClientData) protPtr);
interp = protPtr->interp;
--
cgit v0.12