james/tkgoodstuff
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tcl/Tk 8.5 conversion; compiles but doesn't run

Browse Source 
Compilation throws a ton of warnings, but it's unclear if those
are expected (i.e., pre-existing) or not. Compilation works, but
the resulting executable dies with an error:

"upvar won't create a scalar variable that looks like an array element"
This commit is contained in:
jaeger401 2015-07-08 10:45:00 -04:00
parent ed3a73f960
commit 4f7239111f
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -12,12 +12,10 @@ prefix = /usr
exec_prefix = ${prefix} exec_prefix = ${prefix}
# Where to create the tkgoodstuff library directory # Where to create the tkgoodstuff library directory
#TKG_LIBRARY = $(prefix)/lib/tkgoodstuff TKG_LIBRARY = $(prefix)/lib/tkgoodstuff
TKG_LIBRARY = ./lib/tkgoodstuff
# Where to put the executable scripts (tkgoodstuff, Dialer) # Where to put the executable scripts (tkgoodstuff, Dialer)
#BIN_INSTALL_DIR = $(exec_prefix)/bin BIN_INSTALL_DIR = $(exec_prefix)/bin
BIN_INSTALL_DIR = ./bin
# english or french # english or french
TKG_LANGUAGE = english TKG_LANGUAGE = english
@ -26,7 +24,7 @@ TKG_LANGUAGE = english
EXECSHELL = $(BIN_INSTALL_DIR)/tkgwish$(VERSION) EXECSHELL = $(BIN_INSTALL_DIR)/tkgwish$(VERSION)
SRCDIR = . SRCDIR = .
TCLSH = /usr/bin/tclsh8.0 TCLSH = /usr/bin/tclsh8.5
INSTALL = /usr/bin/install -c INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL} INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DATA = ${INSTALL} -m 644

9
libs/tkInt.h
View File

@ -32,7 +32,7 @@
typedef struct TkColormap TkColormap; typedef struct TkColormap TkColormap;
typedef struct TkGrabEvent TkGrabEvent; typedef struct TkGrabEvent TkGrabEvent;
typedef struct Tk_PostscriptInfo Tk_PostscriptInfo; /*typedef struct Tk_PostscriptInfo Tk_PostscriptInfo;*/
typedef struct TkpCursor *TkpCursor; typedef struct TkpCursor *TkpCursor;
typedef struct TkRegion_ *TkRegion; typedef struct TkRegion_ *TkRegion;
typedef struct TkStressedCmap TkStressedCmap; typedef struct TkStressedCmap TkStressedCmap;
@ -674,15 +674,16 @@ extern TkDisplay *tkDisplayList;
* to the outside world: * to the outside world:
*/ */
extern Tk_Uid tkActiveUid; /* a few things here were extern; removed -- JSG */
Tk_Uid tkActiveUid;
extern Tk_ImageType tkBitmapImageType; extern Tk_ImageType tkBitmapImageType;
extern Tk_Uid tkDisabledUid; Tk_Uid tkDisabledUid;
extern Tk_PhotoImageFormat tkImgFmtGIF; extern Tk_PhotoImageFormat tkImgFmtGIF;
extern void (*tkHandleEventProc) _ANSI_ARGS_(( extern void (*tkHandleEventProc) _ANSI_ARGS_((
XEvent* eventPtr)); XEvent* eventPtr));
extern Tk_PhotoImageFormat tkImgFmtPPM; extern Tk_PhotoImageFormat tkImgFmtPPM;
extern TkMainInfo *tkMainWindowList; extern TkMainInfo *tkMainWindowList;
extern Tk_Uid tkNormalUid; Tk_Uid tkNormalUid;
extern Tk_ImageType tkPhotoImageType; extern Tk_ImageType tkPhotoImageType;
extern Tcl_HashTable tkPredefBitmapTable; extern Tcl_HashTable tkPredefBitmapTable;
extern int tkSendSerial; extern int tkSendSerial;

2
libs/tkUnixPort.h
View File

@ -135,7 +135,7 @@ extern int errno;
* in any other header file. * in any other header file.
*/ */
extern void panic(); /*extern void panic();*/
/* /*
* These functions do nothing under Unix, so we just eliminate calls to them. * These functions do nothing under Unix, so we just eliminate calls to them.

2
libs/tkgButton.c
View File

@ -382,7 +382,7 @@ TkgButtonCreate(clientData, interp, argc, argv, type)
Tk_SetClass(new, classNames[type]); Tk_SetClass(new, classNames[type]);
butPtr = TkpCreateTkgButton(new); butPtr = TkpCreateTkgButton(new);
TkSetClassProcs(new, &tkpTkgButtonProcs, (ClientData) butPtr); Tk_SetClassProcs(new, &tkpTkgButtonProcs, (ClientData) butPtr);
/* /*
* Initialize the data structure for the button. * Initialize the data structure for the button.