summaryrefslogtreecommitdiff
path: root/itcl/itk/win
diff options
context:
space:
mode:
Diffstat (limited to 'itcl/itk/win')
-rw-r--r--itcl/itk/win/Makefile.in19
-rw-r--r--itcl/itk/win/dllEntryPoint.c17
-rw-r--r--itcl/itk/win/makefile.bc1
-rw-r--r--itcl/itk/win/makefile.vc90
-rw-r--r--itcl/itk/win/pkgIndex.tcl2
-rw-r--r--itcl/itk/win/rc/itk.rc252
-rw-r--r--itcl/itk/win/rc/itkwish.rc86
-rw-r--r--itcl/itk/win/winMain.c13
8 files changed, 257 insertions, 223 deletions
diff --git a/itcl/itk/win/Makefile.in b/itcl/itk/win/Makefile.in
index 52dd3f487fb..b7c46ee314f 100644
--- a/itcl/itk/win/Makefile.in
+++ b/itcl/itk/win/Makefile.in
@@ -12,6 +12,11 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
VPATH = @srcdir@:@srcdir@/../generic:@srcdir@/../unix
srcdir = @srcdir@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+mandir=@mandir@
+datadir=@datadir@
CC = @CC@
CFLAGS = @CFLAGS@
@@ -96,16 +101,16 @@ ITKWISHRES = @ITKWISHRES@
ITK_LIBRARY = $(prefix)/share/itk$(ITCL_VERSION)
# Directory in which to install the archive libitcl.a:
-INSTALL_LIB_DIR = @libdir@
+INSTALL_LIB_DIR = $(libdir)
# Directory in which to install the program itclsh:
-INSTALL_BIN_DIR = @bindir@
+INSTALL_BIN_DIR = $(bindir)
# Directory in which to install the include file itcl.h:
-INSTALL_INCLUDE_DIR = @includedir@
+INSTALL_INCLUDE_DIR = $(includedir)
# Top-level directory for manual entries:
-INSTALL_MAN_DIR = @mandir@
+INSTALL_MAN_DIR = $(mandir)
# Directory in which to install manual entry for itclsh:
INSTALL_MAN1_DIR = $(INSTALL_MAN_DIR)/man1
@@ -367,7 +372,7 @@ install-headers:
$(INSTALL_DATA) $$i $(INSTALL_INCLUDE_DIR); \
done;
-install-libraries:
+install-libraries: install-shared-libraries
@for i in $(prefix)/lib $(ITK_LIBRARY); \
do \
if [ ! -d $$i ] ; then \
@@ -389,6 +394,10 @@ install-libraries:
@echo "Installing tclIndex"
@$(INSTALL_DATA) $(SRC_LIB_DIR)/tclIndex $(ITK_LIBRARY)
+install-shared-libraries:
+ @echo "Installing $(ITKDLL) as $(INSTALL_BIN_DIR)/$(ITKDLL)"
+ @$(INSTALL_PROGRAM) $(ITKDLL) $(INSTALL_BIN_DIR)/$(ITKDLL)
+
install-man:
@for i in $(INSTALL_MAN_DIR) $(INSTALL_MAN1_DIR) \
$(INSTALL_MAN3_DIR) $(INSTALL_MANN_DIR) ; \
diff --git a/itcl/itk/win/dllEntryPoint.c b/itcl/itk/win/dllEntryPoint.c
index d7b2f9e3613..8b8c55e9d19 100644
--- a/itcl/itk/win/dllEntryPoint.c
+++ b/itcl/itk/win/dllEntryPoint.c
@@ -4,14 +4,9 @@
* This file implements the Dll entry point as needed by Windows.
*/
-/*
- * dllEntryPoint.c --
- *
- * This file implements the Dll entry point as needed by Windows.
- */
-
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+/* CYGNUS LOCAL */
#include <tcl.h>
/*
@@ -20,15 +15,21 @@
BOOL APIENTRY DllMain _ANSI_ARGS_((HINSTANCE hInst,
DWORD reason, LPVOID reserved));
+/* END CYGNUS LOCAL */
+
+/*
+#if defined(_MSC_VER)
+# define DllEntryPoint DllMain
+#endif
+*/
-/* CYGNUS LOCAL */
#ifdef __CYGWIN32__
/* cygwin32 requires an impure pointer variable, which must be
explicitly initialized when the DLL starts up. */
struct _reent *_impure_ptr;
extern struct _reent *_imp__reent_data;
-#endif
+#endif /* __CYGWIN32__ */
/*
*----------------------------------------------------------------------
diff --git a/itcl/itk/win/makefile.bc b/itcl/itk/win/makefile.bc
index 27fd4e783ba..0d56d4d4ade 100644
--- a/itcl/itk/win/makefile.bc
+++ b/itcl/itk/win/makefile.bc
@@ -66,7 +66,6 @@ LNLIBS_dll = $(ITCLLIBDIR)\$(ITCLLIB) $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB
.path.obj=$(TMPDIR)
ITKWISHOBJS = \
- $(TKLIBDIR)\tkConsole.obj \
$(TMPDIR)\winMain.obj
ITKOBJS = \
diff --git a/itcl/itk/win/makefile.vc b/itcl/itk/win/makefile.vc
index b0653f31892..5d26cf408a3 100644
--- a/itcl/itk/win/makefile.vc
+++ b/itcl/itk/win/makefile.vc
@@ -30,8 +30,9 @@ ITCLDIR = ..\..\itcl
ITKNAMEPREFIX = itk
WISHNAMEPREFIX = itkwish
-VERSION = 30
-DOTVERSION = 3.0
+VERSION = 31
+DOTVERSION = 3.1
+STUBPREFIX = $(ITKNAMEPREFIX)stub
BINROOT = .
!IF "$(NODEBUG)" == "1"
@@ -50,47 +51,66 @@ ITKLIB = $(OUTDIR)\$(ITKNAMEPREFIX)$(VERSION)$(DBGX).lib
ITKWISH = $(OUTDIR)\$(WISHNAMEPREFIX)$(VERSION)$(DBGX).exe
DUMPEXTS = $(TMPDIR)\dumpexts.exe
+ITKSTUBLIBNAME = $(STUBPREFIX)$(VERSION)$(DBGX).lib
+ITKSTUBLIB = $(OUTDIR)\$(ITKSTUBLIBNAME)
+
+
LIB_INSTALL_DIR = $(INSTALLDIR)\lib
BIN_INSTALL_DIR = $(INSTALLDIR)\bin
SCRIPT_INSTALL_DIR = $(INSTALLDIR)\lib\itk$(DOTVERSION)
INCLUDE_INSTALL_DIR = $(INSTALLDIR)\include
ITKWISHOBJS = \
- $(TMPDIR)\winMain.obj \
- $(TMPDIR)\tkConsole.obj
+ $(TMPDIR)\winMain.obj
ITKOBJS = \
+ $(TMPDIR)\itkStubInit.obj \
$(TMPDIR)\itk_archetype.obj \
$(TMPDIR)\itk_cmds.obj \
$(TMPDIR)\itk_option.obj \
$(TMPDIR)\itk_util.obj \
$(TMPDIR)\dllEntryPoint.obj
+ITKSTUBOBJS = \
+ $(TMPDIR)\itkStubLib.obj
+
cc32 = $(TOOLS32)\bin\cl.exe
link32 = $(TOOLS32)\bin\link.exe
rc32 = $(TOOLS32_rc)\bin\rc.exe
include32 = -I$(TOOLS32)\include
+lib32 = "$(TOOLS32)\bin\lib.exe"
WINDIR = $(ROOT)\win
GENERICDIR = $(ROOT)\generic
RCDIR = $(WINDIR)\rc
TCLBUILDDIR = $(TCLDIR)\win\$(OUTDIR)
-TCLLIB = $(TCLBUILDDIR)\tcl80$(DBGX).lib
-TCLDLL = $(TCLBUILDDIR)\tcl80$(DBGX).dll
+TCLLIB = $(TCLBUILDDIR)\tcl81$(DBGX).lib
+TCLSTUBLIB = $(TCLBUILDDIR)\tclstub81$(DBGX).lib
+TCLDLL = $(TCLBUILDDIR)\tcl81$(DBGX).dll
TKBUILDDIR = $(TKDIR)\win\$(OUTDIR)
-TKLIB = $(TKBUILDDIR)\tk80$(DBGX).lib
-TKDLL = $(TKBUILDDIR)\tk80$(DBGX).dll
+TKLIB = $(TKBUILDDIR)\tk81$(DBGX).lib
+TKSTUBLIB = $(TKBUILDDIR)\tkstub81$(DBGX).lib
+TKDLL = $(TKBUILDDIR)\tk81$(DBGX).dll
ITCLBUILDDIR = $(ITCLDIR)\win\$(OUTDIR)
ITCLLIB = $(ITCLBUILDDIR)\itcl$(VERSION)$(DBGX).lib
ITCLDLL = $(ITCLBUILDDIR)\itcl$(VERSION)$(DBGX).dll
+ITCLSTUBLIBNAME = itclstub$(VERSION)$(DBGX).lib
+ITCLSTUBLIB = $(ITCLBUILDDIR)\$(ITCLSTUBLIBNAME)
+
ITK_INCLUDES = -I$(WINDIR) -I$(GENERICDIR) \
- -I$(TCLDIR)\generic -I$(TKDIR)\generic -I$(TKDIR)\xlib -I$(ITCLDIR)\generic
-ITK_DEFINES = -DBUILD_itk $(DEBUGDEFINES)
+ -I$(TCLDIR)\generic -I$(TKDIR)\generic \
+ -I$(TCLDIR)\win -I$(TKDIR)\win \
+ -I$(TKDIR)\xlib -I$(ITCLDIR)\generic
-ITK_CFLAGS = $(cdebug) $(cflags) $(cvarsdll) $(include32) \
- $(ITK_INCLUDES) $(ITK_DEFINES)
+ITK_EXE_DEFINES = -DBUILD_itk $(DEBUGDEFINES)
+
+ITK_EXE_CFLAGS = $(cdebug) $(cflags) $(cvarsdll) $(include32) \
+ $(ITK_INCLUDES) $(ITK_EXE_DEFINES)
+
+ITK_CFLAGS = $(ITK_EXE_CFLAGS) -DUSE_TK_STUBS -DUSE_TCL_STUBS \
+ -DUSE_ITCL_STUBS
######################################################################
# Link flags
@@ -108,7 +128,7 @@ lcommon = /NODEFAULTLIB /RELEASE /NOLOGO
# declarations for use on Intel i386, i486, and Pentium systems
!IF "$(MACHINE)" == "IX86"
DLLENTRY = @12
-lflags = $(lcommon) -align:0x1000 /MACHINE:$(MACHINE)
+lflags = $(lcommon) /MACHINE:$(MACHINE)
!ELSE
lflags = $(lcommon) /MACHINE:$(MACHINE)
!ENDIF
@@ -138,12 +158,12 @@ guilibsdll = $(libcdll) $(winlibs)
!IF "$(NODEBUG)" == "1"
!IF "$(MACHINE)" == "ALPHA"
# MSVC on Alpha doesn't understand -Ot
-cdebug = -O2i -Gs -GD
+cdebug = -O2i -Gs -GD -DNDEBUG
!ELSE
-cdebug = -Oti -Gs -GD
+cdebug = -Oti -Gs -GD -DNDEBUG
!ENDIF
!ELSE
-cdebug = -Z7 -Od -WX
+cdebug = -Z7 -Od -WX -DDEBUG
!ENDIF
# declarations common to all compiler options
@@ -181,31 +201,35 @@ CON_CFLAGS = $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE
# Project specific targets
######################################################################
-all: setup $(ITKWISH)
-test: setup $(ITKWISH)
+all: setup $(ITKWISH) $(ITKDLL) $(ITKSTUBLIB)
+test: setup $(ITKDLL) $(ITKSTUBLIB) $(ITKWISH)
-@copy $(TCLDLL) $(TMPDIR)
-@copy $(TKDLL) $(TMPDIR)
-@copy $(ITCLDLL) $(TMPDIR)
- $(ITKWISH)
+# $(ITKWISH)
setup:
if not exist $(TMPDIR) mkdir $(TMPDIR)
if not exist $(OUTDIR) mkdir $(OUTDIR)
-$(ITKLIB): $(ITKDLL)
-
-$(ITKDLL): $(ITKOBJS) $(TMPDIR)\itk.res $(TMPDIR)\itkvc.def
+$(ITKLIB) : $(ITKDLL) $(ITKSTUBLIB)
+$(ITKDLL) : $(ITKOBJS) $(TMPDIR)\itk.res $(TMPDIR)\itkvc.def
set LIB=$(TOOLS32)\lib
$(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\itkvc.def \
- -out:$@ $(TMPDIR)\itk.res $(TCLLIB) $(TKLIB) $(ITCLLIB) \
- $(guilibsdll) @<<
+ -out:$@ $(TMPDIR)\itk.res $(TCLSTUBLIB) \
+ $(TKSTUBLIB) $(guilibsdll) @<<
$(ITKOBJS)
<<
+
+$(ITKSTUBLIB): $(ITKSTUBOBJS)
+ $(lib32) -nologo -out:$@ $(ITKSTUBOBJS)
+
$(ITKWISH): $(ITKWISHOBJS) $(ITKLIB) $(TMPDIR)\itkwish.res
set LIB=$(TOOLS32)\lib
$(link32) $(ldebug) $(guilflags) $(TMPDIR)\itkwish.res -out:$@ \
- $(guilibsdll) $(TCLLIB) $(TKLIB) $(ITCLLIB) $(ITKLIB) $(ITKWISHOBJS)
+ $(guilibsdll) $(TCLLIB) $(TKLIB) $(ITCLLIB) $(ITKLIB) \
+ $(ITKWISHOBJS)
$(TMPDIR)\itkvc.def: $(DUMPEXTS) $(ITKOBJS)
$(DUMPEXTS) -o $@ $(ITKDLLNAME) @<<
@@ -231,14 +255,24 @@ install: all
copy $(ROOT)\win\*.tcl "$(SCRIPT_INSTALL_DIR)"
#
+# Regenerate the stubs files.
+#
+genstubs:
+ $(TCLSH) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
+ $(GENERICDIR)\itk.decls
+
+#
# Special case object file targets
#
$(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
- $(cc32) -DBUILD_tcl -DBUILD_tk $(ITK_CFLAGS) -Fo$@ $?
+ $(cc32) $(ITK_EXE_CFLAGS) -Fo$@ $?
+
+# The following object is part of the stub library and should not
+# be built as DLL objects but none of the symbols should be exported
-$(TMPDIR)\tkConsole.obj: $(TKDIR)\generic\tkConsole.c
- $(cc32) -DBUILD_tcl -DBUILD_tk $(ITK_CFLAGS) -Fo$@ $?
+$(TMPDIR)\itkStubLib.obj : $(GENERICDIR)\itkStubLib.c
+ $(cc32) -DSTATIC_BUILD $(ITK_CFLAGS) -Fo$@ $?
#
# Implicit rules
diff --git a/itcl/itk/win/pkgIndex.tcl b/itcl/itk/win/pkgIndex.tcl
index e9eac5973a9..381ad6cae08 100644
--- a/itcl/itk/win/pkgIndex.tcl
+++ b/itcl/itk/win/pkgIndex.tcl
@@ -1,3 +1,3 @@
# Tcl package index file, version 1.0
-package ifneeded Itk 3.0 [list load itk30.dll Itk]
+package ifneeded Itk 3.1 [list load [file join $dir itk31.dll] Itk]
diff --git a/itcl/itk/win/rc/itk.rc b/itcl/itk/win/rc/itk.rc
index 65cb79be4cf..f63bf01dc7d 100644
--- a/itcl/itk/win/rc/itk.rc
+++ b/itcl/itk/win/rc/itk.rc
@@ -1,126 +1,126 @@
-// SCCS: @(#) tk.rc 1.17 96/09/12 16:22:08
-//
-// Version
-//
-
-#define RESOURCE_INCLUDED
-#include <itcl.h>
-#include <itk.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL,0
- PRODUCTVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "FileDescription", "Itk DLL\0"
- VALUE "Authors", "Michael McLennan\0"
-
- VALUE "OriginalFilename", "itk" STRINGIFY(ITCL_MAJOR_VERSION) STRINGIFY(ITCL_MINOR_VERSION) ".dll\0"
- VALUE "CompanyName", "Bell Labs Innovations for Lucent Technologies\0"
- VALUE "FileVersion", ITCL_PATCH_LEVEL
- VALUE "LegalCopyright", "Copyright \251 1993-1998\0"
- VALUE "ProductName", "[incr Tk] " ITCL_VERSION " for Windows\0"
- VALUE "ProductVersion", ITCL_PATCH_LEVEL
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-//
-// Icon
-//
-
-tk ICON DISCARDABLE "itk.ico"
-
-//
-// Cursor
-//
-
-X_cursor CURSOR DISCARDABLE "cursor00.cur"
-arrow CURSOR DISCARDABLE "cursor02.cur"
-based_arrow_down CURSOR DISCARDABLE "cursor04.cur"
-based_arrow_up CURSOR DISCARDABLE "cursor06.cur"
-boat CURSOR DISCARDABLE "cursor08.cur"
-bogosity CURSOR DISCARDABLE "cursor0a.cur"
-bottom_left_corner CURSOR DISCARDABLE "cursor0c.cur"
-bottom_right_corner CURSOR DISCARDABLE "cursor0e.cur"
-bottom_side CURSOR DISCARDABLE "cursor10.cur"
-bottom_tee CURSOR DISCARDABLE "cursor12.cur"
-box_spiral CURSOR DISCARDABLE "cursor14.cur"
-center_ptr CURSOR DISCARDABLE "cursor16.cur"
-circle CURSOR DISCARDABLE "cursor18.cur"
-clock CURSOR DISCARDABLE "cursor1a.cur"
-coffee_mug CURSOR DISCARDABLE "cursor1c.cur"
-cross CURSOR DISCARDABLE "cursor1e.cur"
-cross_reverse CURSOR DISCARDABLE "cursor20.cur"
-crosshair CURSOR DISCARDABLE "cursor22.cur"
-diamond_cross CURSOR DISCARDABLE "cursor24.cur"
-dot CURSOR DISCARDABLE "cursor26.cur"
-dotbox CURSOR DISCARDABLE "cursor28.cur"
-double_arrow CURSOR DISCARDABLE "cursor2a.cur"
-draft_large CURSOR DISCARDABLE "cursor2c.cur"
-draft_small CURSOR DISCARDABLE "cursor2e.cur"
-draped_box CURSOR DISCARDABLE "cursor30.cur"
-exchange CURSOR DISCARDABLE "cursor32.cur"
-fleur CURSOR DISCARDABLE "cursor34.cur"
-gobbler CURSOR DISCARDABLE "cursor36.cur"
-gumby CURSOR DISCARDABLE "cursor38.cur"
-hand1 CURSOR DISCARDABLE "cursor3a.cur"
-hand2 CURSOR DISCARDABLE "cursor3c.cur"
-heart CURSOR DISCARDABLE "cursor3e.cur"
-icon CURSOR DISCARDABLE "cursor40.cur"
-iron_cross CURSOR DISCARDABLE "cursor42.cur"
-left_ptr CURSOR DISCARDABLE "cursor44.cur"
-left_side CURSOR DISCARDABLE "cursor46.cur"
-left_tee CURSOR DISCARDABLE "cursor48.cur"
-leftbutton CURSOR DISCARDABLE "cursor4a.cur"
-ll_angle CURSOR DISCARDABLE "cursor4c.cur"
-lr_angle CURSOR DISCARDABLE "cursor4e.cur"
-man CURSOR DISCARDABLE "cursor50.cur"
-middlebutton CURSOR DISCARDABLE "cursor52.cur"
-mouse CURSOR DISCARDABLE "cursor54.cur"
-pencil CURSOR DISCARDABLE "cursor56.cur"
-pirate CURSOR DISCARDABLE "cursor58.cur"
-plus CURSOR DISCARDABLE "cursor5a.cur"
-question_arrow CURSOR DISCARDABLE "cursor5c.cur"
-right_ptr CURSOR DISCARDABLE "cursor5e.cur"
-right_side CURSOR DISCARDABLE "cursor60.cur"
-right_tee CURSOR DISCARDABLE "cursor62.cur"
-rightbutton CURSOR DISCARDABLE "cursor64.cur"
-rtl_logo CURSOR DISCARDABLE "cursor66.cur"
-sailboat CURSOR DISCARDABLE "cursor68.cur"
-sb_down_arrow CURSOR DISCARDABLE "cursor6a.cur"
-sb_h_double_arrow CURSOR DISCARDABLE "cursor6c.cur"
-sb_left_arrow CURSOR DISCARDABLE "cursor6e.cur"
-sb_right_arrow CURSOR DISCARDABLE "cursor70.cur"
-sb_up_arrow CURSOR DISCARDABLE "cursor72.cur"
-sb_v_double_arrow CURSOR DISCARDABLE "cursor74.cur"
-shuttle CURSOR DISCARDABLE "cursor76.cur"
-sizing CURSOR DISCARDABLE "cursor78.cur"
-spider CURSOR DISCARDABLE "cursor7a.cur"
-spraycan CURSOR DISCARDABLE "cursor7c.cur"
-star CURSOR DISCARDABLE "cursor7e.cur"
-target CURSOR DISCARDABLE "cursor80.cur"
-tcross CURSOR DISCARDABLE "cursor82.cur"
-top_left_arrow CURSOR DISCARDABLE "cursor84.cur"
-top_left_corner CURSOR DISCARDABLE "cursor86.cur"
-top_right_corner CURSOR DISCARDABLE "cursor88.cur"
-top_side CURSOR DISCARDABLE "cursor8a.cur"
-top_tee CURSOR DISCARDABLE "cursor8c.cur"
-trek CURSOR DISCARDABLE "cursor8e.cur"
-ul_angle CURSOR DISCARDABLE "cursor90.cur"
-umbrella CURSOR DISCARDABLE "cursor92.cur"
-ur_angle CURSOR DISCARDABLE "cursor94.cur"
-watch CURSOR DISCARDABLE "cursor96.cur"
-xterm CURSOR DISCARDABLE "cursor98.cur"
+// SCCS: @(#) tk.rc 1.17 96/09/12 16:22:08
+//
+// Version
+//
+
+#define VS_VERSION_INFO 1
+#define RESOURCE_INCLUDED
+#include <itcl.h>
+#include <itk.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL
+ PRODUCTVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "FileDescription", "Itk language extension for Tcl\0"
+ VALUE "Authors", "Michael McLennan\0"
+ VALUE "OriginalFilename", "itk" STRINGIFY(ITCL_MAJOR_VERSION) STRINGIFY(ITCL_MINOR_VERSION) ".dll\0"
+ VALUE "CompanyName", "Bell Labs Innovations for Lucent Technologies\0"
+ VALUE "FileVersion", ITCL_PATCH_LEVEL
+ VALUE "LegalCopyright", "Copyright \251 1993-1998\0"
+ VALUE "ProductName", "[incr Tk] " ITCL_VERSION " for Windows\0"
+ VALUE "ProductVersion", ITCL_PATCH_LEVEL
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+//
+// Icon
+//
+
+tk ICON DISCARDABLE "itk.ico"
+
+//
+// Cursor
+//
+
+X_cursor CURSOR DISCARDABLE "cursor00.cur"
+arrow CURSOR DISCARDABLE "cursor02.cur"
+based_arrow_down CURSOR DISCARDABLE "cursor04.cur"
+based_arrow_up CURSOR DISCARDABLE "cursor06.cur"
+boat CURSOR DISCARDABLE "cursor08.cur"
+bogosity CURSOR DISCARDABLE "cursor0a.cur"
+bottom_left_corner CURSOR DISCARDABLE "cursor0c.cur"
+bottom_right_corner CURSOR DISCARDABLE "cursor0e.cur"
+bottom_side CURSOR DISCARDABLE "cursor10.cur"
+bottom_tee CURSOR DISCARDABLE "cursor12.cur"
+box_spiral CURSOR DISCARDABLE "cursor14.cur"
+center_ptr CURSOR DISCARDABLE "cursor16.cur"
+circle CURSOR DISCARDABLE "cursor18.cur"
+clock CURSOR DISCARDABLE "cursor1a.cur"
+coffee_mug CURSOR DISCARDABLE "cursor1c.cur"
+cross CURSOR DISCARDABLE "cursor1e.cur"
+cross_reverse CURSOR DISCARDABLE "cursor20.cur"
+crosshair CURSOR DISCARDABLE "cursor22.cur"
+diamond_cross CURSOR DISCARDABLE "cursor24.cur"
+dot CURSOR DISCARDABLE "cursor26.cur"
+dotbox CURSOR DISCARDABLE "cursor28.cur"
+double_arrow CURSOR DISCARDABLE "cursor2a.cur"
+draft_large CURSOR DISCARDABLE "cursor2c.cur"
+draft_small CURSOR DISCARDABLE "cursor2e.cur"
+draped_box CURSOR DISCARDABLE "cursor30.cur"
+exchange CURSOR DISCARDABLE "cursor32.cur"
+fleur CURSOR DISCARDABLE "cursor34.cur"
+gobbler CURSOR DISCARDABLE "cursor36.cur"
+gumby CURSOR DISCARDABLE "cursor38.cur"
+hand1 CURSOR DISCARDABLE "cursor3a.cur"
+hand2 CURSOR DISCARDABLE "cursor3c.cur"
+heart CURSOR DISCARDABLE "cursor3e.cur"
+icon CURSOR DISCARDABLE "cursor40.cur"
+iron_cross CURSOR DISCARDABLE "cursor42.cur"
+left_ptr CURSOR DISCARDABLE "cursor44.cur"
+left_side CURSOR DISCARDABLE "cursor46.cur"
+left_tee CURSOR DISCARDABLE "cursor48.cur"
+leftbutton CURSOR DISCARDABLE "cursor4a.cur"
+ll_angle CURSOR DISCARDABLE "cursor4c.cur"
+lr_angle CURSOR DISCARDABLE "cursor4e.cur"
+man CURSOR DISCARDABLE "cursor50.cur"
+middlebutton CURSOR DISCARDABLE "cursor52.cur"
+mouse CURSOR DISCARDABLE "cursor54.cur"
+pencil CURSOR DISCARDABLE "cursor56.cur"
+pirate CURSOR DISCARDABLE "cursor58.cur"
+plus CURSOR DISCARDABLE "cursor5a.cur"
+question_arrow CURSOR DISCARDABLE "cursor5c.cur"
+right_ptr CURSOR DISCARDABLE "cursor5e.cur"
+right_side CURSOR DISCARDABLE "cursor60.cur"
+right_tee CURSOR DISCARDABLE "cursor62.cur"
+rightbutton CURSOR DISCARDABLE "cursor64.cur"
+rtl_logo CURSOR DISCARDABLE "cursor66.cur"
+sailboat CURSOR DISCARDABLE "cursor68.cur"
+sb_down_arrow CURSOR DISCARDABLE "cursor6a.cur"
+sb_h_double_arrow CURSOR DISCARDABLE "cursor6c.cur"
+sb_left_arrow CURSOR DISCARDABLE "cursor6e.cur"
+sb_right_arrow CURSOR DISCARDABLE "cursor70.cur"
+sb_up_arrow CURSOR DISCARDABLE "cursor72.cur"
+sb_v_double_arrow CURSOR DISCARDABLE "cursor74.cur"
+shuttle CURSOR DISCARDABLE "cursor76.cur"
+sizing CURSOR DISCARDABLE "cursor78.cur"
+spider CURSOR DISCARDABLE "cursor7a.cur"
+spraycan CURSOR DISCARDABLE "cursor7c.cur"
+star CURSOR DISCARDABLE "cursor7e.cur"
+target CURSOR DISCARDABLE "cursor80.cur"
+tcross CURSOR DISCARDABLE "cursor82.cur"
+top_left_arrow CURSOR DISCARDABLE "cursor84.cur"
+top_left_corner CURSOR DISCARDABLE "cursor86.cur"
+top_right_corner CURSOR DISCARDABLE "cursor88.cur"
+top_side CURSOR DISCARDABLE "cursor8a.cur"
+top_tee CURSOR DISCARDABLE "cursor8c.cur"
+trek CURSOR DISCARDABLE "cursor8e.cur"
+ul_angle CURSOR DISCARDABLE "cursor90.cur"
+umbrella CURSOR DISCARDABLE "cursor92.cur"
+ur_angle CURSOR DISCARDABLE "cursor94.cur"
+watch CURSOR DISCARDABLE "cursor96.cur"
+xterm CURSOR DISCARDABLE "cursor98.cur"
diff --git a/itcl/itk/win/rc/itkwish.rc b/itcl/itk/win/rc/itkwish.rc
index 88b91e08186..94fd89fdb21 100644
--- a/itcl/itk/win/rc/itkwish.rc
+++ b/itcl/itk/win/rc/itkwish.rc
@@ -1,43 +1,43 @@
-// SCCS: @(#) wish.rc 1.13 96/09/12 16:22:14
-//
-// Version
-//
-
-#define RESOURCE_INCLUDED
-#include <itcl.h>
-#include <itk.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL,0
- PRODUCTVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "FileDescription", "[incr Tk] Object-Oriented Wish Application\0"
- VALUE "Authors", "Michael McLennan\0"
- VALUE "OriginalFilename", "itkwish.exe\0"
- VALUE "CompanyName", "Bell Labs Innovations for Lucent Technologies\0"
- VALUE "FileVersion", ITCL_PATCH_LEVEL
- VALUE "LegalCopyright", "Copyright \251 1993-1998\0"
- VALUE "ProductName", "[incr Tk] " ITCL_VERSION " for Windows\0"
- VALUE "ProductVersion", ITCL_PATCH_LEVEL
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-//
-// Icon
-//
-
-wish ICON DISCARDABLE "itk.ico"
+// SCCS: @(#) wish.rc 1.13 96/09/12 16:22:14
+//
+// Version
+//
+
+#define RESOURCE_INCLUDED
+#include <itcl.h>
+#include <itk.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL
+ PRODUCTVERSION ITCL_MAJOR_VERSION,ITCL_MINOR_VERSION,ITCL_RELEASE_LEVEL
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "FileDescription", "[incr Tk] Object-Oriented Wish Application\0"
+ VALUE "Authors", "Michael McLennan\0"
+ VALUE "OriginalFilename", "itkwish.exe\0"
+ VALUE "CompanyName", "Bell Labs Innovations for Lucent Technologies\0"
+ VALUE "FileVersion", ITCL_PATCH_LEVEL
+ VALUE "LegalCopyright", "Copyright \251 1993-1998\0"
+ VALUE "ProductName", "[incr Tk] " ITCL_VERSION " for Windows\0"
+ VALUE "ProductVersion", ITCL_PATCH_LEVEL
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+//
+// Icon
+//
+
+wish ICON DISCARDABLE "itk.ico"
diff --git a/itcl/itk/win/winMain.c b/itcl/itk/win/winMain.c
index bcd32cba6b3..4ec8d1976c4 100644
--- a/itcl/itk/win/winMain.c
+++ b/itcl/itk/win/winMain.c
@@ -21,15 +21,8 @@
#include "itk.h"
/* include tclInt.h for access to namespace API */
-#include "tclInt.h"
+#include "tkInt.h"
-/*
- * The following declarations refer to internal Tk routines. These
- * interfaces are available for use, but are not supported.
- */
-
-EXTERN void TkConsoleCreate(void);
-EXTERN int TkConsoleInit(Tcl_Interp *interp);
/*
* Forward declarations for procedures defined later in this file:
@@ -96,8 +89,6 @@ WinMain(hInstance, hPrevInstance, lpszCmdLine, nCmdShow)
* called to attach the console to a text widget.
*/
- TkConsoleCreate();
-
setargv(&argc, &argv);
/*
@@ -182,7 +173,7 @@ Tcl_AppInit(interp)
* application.
*/
- if (TkConsoleInit(interp) == TCL_ERROR) {
+ if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
goto error;
}
View Lorry Controller Status