diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-30 04:34:50 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-30 04:34:50 (GMT) |
| commit | 91ae12c773a03fe4533d19a6d115deb6a4c95351 (patch) | |
| tree | 7248ac19414918cc38c6d14a602c4ba094ef3e83 /win | |
| parent | 3f9d8f314ffa4e803d29993d3b1248b6c733b2c5 (diff) | |
| parent | 29067ec103d779feffa6d5dea099666cc2785b76 (diff) | |
| download | tk-91ae12c773a03fe4533d19a6d115deb6a4c95351.zip tk-91ae12c773a03fe4533d19a6d115deb6a4c95351.tar.gz tk-91ae12c773a03fe4533d19a6d115deb6a4c95351.tar.bz2 | |
Simpify determination whether we are running on cygwin.
Export Tk_GetHINSTANCE, TkSetPixmapColormap and TkpPrintWindowId on the Cygwin dll.
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 14 | ||||
| -rw-r--r-- | win/tkWinPort.h | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 7958e3c..89b61cd 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -708,4 +708,16 @@ genstubs: $(TCL_EXE) "$(TCL_TOOL_DIR)/genStubs.tcl" \ "$(GENERIC_DIR_NATIVE)" \ "$(GENERIC_DIR_NATIVE)/tk.decls" \ - "$(GENERIC_DIR_NATIVE)/tkInt.decls" + "$(GENERIC_DIR_NATIVE)/tkInt.decls" +# +# The list of all the targets that do not correspond to real files. This stops +# 'make' from getting confused when someone makes an error in a rule. +# + +.PHONY: all binaries libraries doc tkLibObjs objs tktest-real test test-classic +.PHONY: test-ttk testlang runtest shell demo gdb install install-strip +.PHONY: install-binaries install-libraries install-demos install-doc +.PHONY: install-private-headers clean distclean depend genstubs checkstubs +.PHONY: checkuchar checkexports rpm dist alldist allpatch html html-tcl html-tk + +# DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/win/tkWinPort.h b/win/tkWinPort.h index 907412b..83b67c6 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -95,6 +95,8 @@ * under Windows. */ +#define TkFreeWindowId(dispPtr,w) +#define TkInitXId(dispPtr) #define XFlush(display) #define XGrabServer(display) #define XUngrabServer(display) |