Get rid of pre-C89-isms (esp. CONST vs const).

1 files changed, 33 insertions, 33 deletions

diff --git a/generic/tkMessage.c b/generic/tkMessage.c
index 048bb5c..ff33d48 100644
--- a/generic/tkMessage.c
+++ b/generic/tkMessage.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: tkMessage.c,v 1.19 2007/12/13 15:24:16 dgp Exp $
+ * RCS: @(#) $Id: tkMessage.c,v 1.20 2008/04/27 22:38:56 dkf Exp $
  */
 
 #include "default.h"
@@ -173,15 +173,15 @@ static void		MessageCmdDeletedProc(ClientData clientData);
 static void		MessageEventProc(ClientData clientData,
 			    XEvent *eventPtr);
 static char *		MessageTextVarProc(ClientData clientData,
-			    Tcl_Interp *interp, CONST char *name1,
-			    CONST char *name2, int flags);
+			    Tcl_Interp *interp, const char *name1,
+			    const char *name2, int flags);
 static int		MessageWidgetObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *CONST objv[]);
+			    Tcl_Obj *const objv[]);
 static void		MessageWorldChanged(ClientData instanceData);
 static void		ComputeMessageGeometry(Message *msgPtr);
 static int		ConfigureMessage(Tcl_Interp *interp, Message *msgPtr,
-			    int objc, Tcl_Obj *CONST objv[], int flags);
+			    int objc, Tcl_Obj *const objv[], int flags);
 static void		DestroyMessage(char *memPtr);
 static void		DisplayMessage(ClientData clientData);
 
@@ -217,7 +217,7 @@ Tk_MessageObjCmd(
     ClientData clientData,	/* NULL. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument strings. */
+    Tcl_Obj *const objv[])	/* Argument strings. */
 {
     register Message *msgPtr;
     Tk_OptionTable optionTable;
@@ -252,8 +252,8 @@ Tk_MessageObjCmd(
     msgPtr->display = Tk_Display(tkwin);
     msgPtr->interp = interp;
     msgPtr->widgetCmd = Tcl_CreateObjCommand(interp,
-	    Tk_PathName(msgPtr->tkwin), MessageWidgetObjCmd,
-	    (ClientData) msgPtr, MessageCmdDeletedProc);
+	    Tk_PathName(msgPtr->tkwin), MessageWidgetObjCmd, msgPtr,
+	    MessageCmdDeletedProc);
     msgPtr->optionTable = optionTable;
     msgPtr->relief = TK_RELIEF_FLAT;
     msgPtr->textGC = None;
@@ -263,10 +263,10 @@ Tk_MessageObjCmd(
     msgPtr->cursor = None;
 
     Tk_SetClass(msgPtr->tkwin, "Message");
-    Tk_SetClassProcs(msgPtr->tkwin, &messageClass, (ClientData) msgPtr);
+    Tk_SetClassProcs(msgPtr->tkwin, &messageClass, msgPtr);
     Tk_CreateEventHandler(msgPtr->tkwin,
 	    ExposureMask|StructureNotifyMask|FocusChangeMask,
-	    MessageEventProc, (ClientData) msgPtr);
+	    MessageEventProc, msgPtr);
     if (Tk_InitOptions(interp, (char *)msgPtr, optionTable, tkwin) != TCL_OK) {
 	Tk_DestroyWindow(msgPtr->tkwin);
 	return TCL_ERROR;
@@ -304,10 +304,10 @@ MessageWidgetObjCmd(
     ClientData clientData,	/* Information about message widget. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
-    Tcl_Obj *CONST objv[])	/* Argument strings. */
+    Tcl_Obj *const objv[])	/* Argument strings. */
 {
-    register Message *msgPtr = (Message *) clientData;
-    static CONST char *optionStrings[] = { "cget", "configure", NULL };
+    register Message *msgPtr = clientData;
+    static const char *optionStrings[] = { "cget", "configure", NULL };
     enum options { MESSAGE_CGET, MESSAGE_CONFIGURE };
     int index;
     int result = TCL_OK;
@@ -323,7 +323,7 @@ MessageWidgetObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_Preserve((ClientData) msgPtr);
+    Tcl_Preserve(msgPtr);
 
     switch ((enum options) index) {
     case MESSAGE_CGET:
@@ -358,7 +358,7 @@ MessageWidgetObjCmd(
 	break;
     }
 
-    Tcl_Release((ClientData) msgPtr);
+    Tcl_Release(msgPtr);
     return result;
 }
 
@@ -390,7 +390,7 @@ DestroyMessage(
 
     Tcl_DeleteCommandFromToken(msgPtr->interp, msgPtr->widgetCmd);
     if (msgPtr->flags & REDRAW_PENDING) {
-	Tcl_CancelIdleCall(DisplayMessage, (ClientData) msgPtr);
+	Tcl_CancelIdleCall(DisplayMessage, msgPtr);
     }
 
     /*
@@ -407,7 +407,7 @@ DestroyMessage(
     if (msgPtr->textVarName != NULL) {
 	Tcl_UntraceVar(msgPtr->interp, msgPtr->textVarName,
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		MessageTextVarProc, (ClientData) msgPtr);
+		MessageTextVarProc, msgPtr);
     }
     Tk_FreeConfigOptions((char *) msgPtr, msgPtr->optionTable, msgPtr->tkwin);
     msgPtr->tkwin = NULL;
@@ -440,7 +440,7 @@ ConfigureMessage(
     register Message *msgPtr,	/* Information about widget; may or may not
 				 * already have values for some fields. */
     int objc,			/* Number of valid entries in argv. */
-    Tcl_Obj *CONST objv[],	/* Arguments. */
+    Tcl_Obj *const objv[],	/* Arguments. */
     int flags)			/* Flags to pass to Tk_ConfigureWidget. */
 {
     Tk_SavedOptions savedOptions;
@@ -452,7 +452,7 @@ ConfigureMessage(
     if (msgPtr->textVarName != NULL) {
 	Tcl_UntraceVar(interp, msgPtr->textVarName,
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		MessageTextVarProc, (ClientData) msgPtr);
+		MessageTextVarProc, msgPtr);
     }
 
     if (Tk_SetOptions(interp, (char *) msgPtr, msgPtr->optionTable, objc, objv,
@@ -468,7 +468,7 @@ ConfigureMessage(
      */
 
     if (msgPtr->textVarName != NULL) {
-	CONST char *value;
+	const char *value;
 
 	value = Tcl_GetVar(interp, msgPtr->textVarName, TCL_GLOBAL_ONLY);
 	if (value == NULL) {
@@ -482,7 +482,7 @@ ConfigureMessage(
 	}
 	Tcl_TraceVar(interp, msgPtr->textVarName,
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		MessageTextVarProc, (ClientData) msgPtr);
+		MessageTextVarProc, msgPtr);
     }
 
     /*
@@ -498,7 +498,7 @@ ConfigureMessage(
     }
 
     Tk_FreeSavedOptions(&savedOptions);
-    MessageWorldChanged((ClientData) msgPtr);
+    MessageWorldChanged(msgPtr);
     return TCL_OK;
 }
 
@@ -559,7 +559,7 @@ MessageWorldChanged(
     ComputeMessageGeometry(msgPtr);
     if ((msgPtr->tkwin != NULL) && Tk_IsMapped(msgPtr->tkwin)
 	    && !(msgPtr->flags & REDRAW_PENDING)) {
-	Tcl_DoWhenIdle(DisplayMessage, (ClientData) msgPtr);
+	Tcl_DoWhenIdle(DisplayMessage, msgPtr);
 	msgPtr->flags |= REDRAW_PENDING;
     }
 }
@@ -668,7 +668,7 @@ static void
 DisplayMessage(
     ClientData clientData)	/* Information about window. */
 {
-    register Message *msgPtr = (Message *) clientData;
+    register Message *msgPtr = clientData;
     register Tk_Window tkwin = msgPtr->tkwin;
     int x, y;
     int borderWidth = msgPtr->highlightWidth;
@@ -744,13 +744,13 @@ MessageEventProc(
     ClientData clientData,	/* Information about window. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    Message *msgPtr = (Message *) clientData;
+    Message *msgPtr = clientData;
 
     if (((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0))
 	    || (eventPtr->type == ConfigureNotify)) {
 	goto redraw;
     } else if (eventPtr->type == DestroyNotify) {
-	DestroyMessage((char *) clientData);
+	DestroyMessage(clientData);
     } else if (eventPtr->type == FocusIn) {
 	if (eventPtr->xfocus.detail != NotifyInferior) {
 	    msgPtr->flags |= GOT_FOCUS;
@@ -770,7 +770,7 @@ MessageEventProc(
 
   redraw:
     if ((msgPtr->tkwin != NULL) && !(msgPtr->flags & REDRAW_PENDING)) {
-	Tcl_DoWhenIdle(DisplayMessage, (ClientData) msgPtr);
+	Tcl_DoWhenIdle(DisplayMessage, msgPtr);
 	msgPtr->flags |= REDRAW_PENDING;
     }
 }
@@ -797,7 +797,7 @@ static void
 MessageCmdDeletedProc(
     ClientData clientData)	/* Pointer to widget record for widget. */
 {
-    Message *msgPtr = (Message *) clientData;
+    Message *msgPtr = clientData;
 
     /*
      * This function could be invoked either because the window was destroyed
@@ -833,12 +833,12 @@ static char *
 MessageTextVarProc(
     ClientData clientData,	/* Information about message. */
     Tcl_Interp *interp,		/* Interpreter containing variable. */
-    CONST char *name1,		/* Name of variable. */
-    CONST char *name2,		/* Second part of variable name. */
+    const char *name1,		/* Name of variable. */
+    const char *name2,		/* Second part of variable name. */
     int flags)			/* Information about what happened. */
 {
-    register Message *msgPtr = (Message *) clientData;
-    CONST char *value;
+    register Message *msgPtr = clientData;
+    const char *value;
 
     /*
      * If the variable is unset, then immediately recreate it unless the whole
@@ -870,7 +870,7 @@ MessageTextVarProc(
 
     if ((msgPtr->tkwin != NULL) && Tk_IsMapped(msgPtr->tkwin)
 	    && !(msgPtr->flags & REDRAW_PENDING)) {
-	Tcl_DoWhenIdle(DisplayMessage, (ClientData) msgPtr);
+	Tcl_DoWhenIdle(DisplayMessage, msgPtr);
 	msgPtr->flags |= REDRAW_PENDING;
     }
     return NULL;