diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-23 17:03:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-23 17:03:58 (GMT) |
| commit | 787ed6db2a4b2c37ff8cd6bd62ba11fb5dd893db (patch) | |
| tree | 54cc003accac76149da3cd06a380499c6ddb2c6d /unix | |
| parent | 988a082c79aaa22ff13577f29f7024fca77a20cb (diff) | |
| parent | 34bbe087ee9542cd9a5b43c0402cee944ffc1de9 (diff) | |
| download | tk-787ed6db2a4b2c37ff8cd6bd62ba11fb5dd893db.zip tk-787ed6db2a4b2c37ff8cd6bd62ba11fb5dd893db.tar.gz tk-787ed6db2a4b2c37ff8cd6bd62ba11fb5dd893db.tar.bz2 | |
Merge 8.7. Start integrating ICU with Tk. WIP.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 7 | ||||
| -rw-r--r-- | unix/tkUnixInit.c | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index a543466..6626a66 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -389,7 +389,7 @@ STUB_OBJS = tkStubInit.o STUB_LIB_OBJS = tkStubLib.o ttkStubLib.o X11_OBJS = tkUnix.o tkUnix3d.o tkUnixButton.o tkUnixColor.o tkUnixConfig.o \ - tkUnixCursor.o tkUnixDraw.o tkUnixEmbed.o tkUnixEvent.o \ + tkUnixCursor.o tkUnixDraw.o tkUnixEmbed.o tkUnixEvent.o tkIcu.o \ tkUnixFocus.o $(FONT_OBJS) tkUnixInit.o tkUnixKey.o tkUnixMenu.o \ tkUnixMenubu.o tkUnixScale.o tkUnixScrlbr.o tkUnixSelect.o \ tkUnixSend.o tkUnixSysNotify.o tkUnixSysTray.o tkUnixWm.o tkUnixXId.o @@ -507,7 +507,7 @@ X11_SRCS = \ $(UNIX_DIR)/tkUnixCursor.c \ $(UNIX_DIR)/tkUnixDraw.c \ $(UNIX_DIR)/tkUnixEmbed.c $(UNIX_DIR)/tkUnixEvent.c \ - $(UNIX_DIR)/tkUnixFocus.c \ + $(UNIX_DIR)/tkUnixFocus.c $(GENERIC_DIR)/tkIcu.c \ $(UNIX_DIR)/tkUnixRFont.c \ $(UNIX_DIR)/tkUnixFont.c $(UNIX_DIR)/tkUnixInit.c \ $(UNIX_DIR)/tkUnixKey.c \ @@ -1296,6 +1296,9 @@ tkUnixEmbed.o: $(UNIX_DIR)/tkUnixEmbed.c tkUnixEvent.o: $(UNIX_DIR)/tkUnixEvent.c $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixEvent.c +tkIcu.o: $(GENERIC_DIR)/tkIcu.c + $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkIcu.c + tkUnixFocus.o: $(UNIX_DIR)/tkUnixFocus.c $(CC) -c $(CC_SWITCHES) $(UNIX_DIR)/tkUnixFocus.c diff --git a/unix/tkUnixInit.c b/unix/tkUnixInit.c index 1c716f4..e20f2f3 100644 --- a/unix/tkUnixInit.c +++ b/unix/tkUnixInit.c @@ -43,6 +43,7 @@ TkpInit( GetLibraryPath(interp); Tktray_Init(interp); (void)SysNotify_Init (interp); + Icu_Init(interp); return TCL_OK; } |