summaryrefslogtreecommitdiffstats
path: root/generic/tkPack.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2002-01-17 05:13:11 (GMT)
committerdgp <dgp@users.sourceforge.net>2002-01-17 05:13:11 (GMT)
commite18b826ed756e177fc0e6f96fed210bf26bcb8b7 (patch)
treea64645a35b960e288a19b038e87f81a9248f5709 /generic/tkPack.c
parente2d6df79c697064b173e14f29a157733ad3a9a6f (diff)
downloadtk-e18b826ed756e177fc0e6f96fed210bf26bcb8b7.zip
tk-e18b826ed756e177fc0e6f96fed210bf26bcb8b7.tar.gz
tk-e18b826ed756e177fc0e6f96fed210bf26bcb8b7.tar.bz2
* Updates to handle change in type of tablePtr
argument of Tcl_GetIndexFromObj(Struct) from (char **) to (CONST char **). [TIP 27] [Patch 504705]
Diffstat (limited to 'generic/tkPack.c')
-rw-r--r--generic/tkPack.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tkPack.c b/generic/tkPack.c
index a8757b0..8033b7b 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -10,14 +10,16 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkPack.c,v 1.14 2001/11/23 02:06:57 das Exp $
+ * RCS: @(#) $Id: tkPack.c,v 1.15 2002/01/17 05:13:11 dgp Exp $
*/
#include "tkPort.h"
#include "tkInt.h"
typedef enum {TOP, BOTTOM, LEFT, RIGHT} Side;
-static char *sideNames[] = {"top", "bottom", "left", "right", (char *) NULL };
+static CONST char *sideNames[] = {
+ "top", "bottom", "left", "right", (char *) NULL
+};
/* For each window that the packer cares about (either because
* the window is managed by the packer or because the window
@@ -201,7 +203,7 @@ Tk_PackObjCmd(clientData, interp, objc, objv)
{
Tk_Window tkwin = (Tk_Window) clientData;
char *argv2;
- static char *optionStrings[] = {
+ static CONST char *optionStrings[] = {
/* after, append, before and unpack are deprecated */
"after", "append", "before", "unpack",
"configure", "forget", "info", "propagate", "slaves", (char *) NULL };
@@ -1550,7 +1552,7 @@ ConfigureSlaves(interp, tkwin, objc, objv)
Tk_Window other, slave, parent, ancestor;
int i, j, numWindows, tmp, positionGiven;
char *string;
- static char *optionStrings[] = {
+ static CONST char *optionStrings[] = {
"-after", "-anchor", "-before", "-expand", "-fill",
"-in", "-ipadx", "-ipady", "-padx", "-pady", "-side", (char *) NULL };
enum options {