From 6b3c72d47a56a62cdc0a26e8ad8cc8db289b2869 Mon Sep 17 00:00:00 2001 From: ericm Date: Sat, 2 Sep 2000 01:18:23 +0000 Subject: * win/makefile.vc (install-libraries): * win/Makefile.in (install-libraries): * unix/Makefile.in (install-libraries): Added tkPlatDecls.h to list of header files to install. * generic/tk.h: Added #include "tkPlatDecls.h", which declares the platform specific component of the public Tk stubs API's. --- ChangeLog | 10 ++++++++++ generic/tk.h | 10 ++++++++-- unix/Makefile.in | 5 +++-- win/Makefile.in | 6 +++--- win/makefile.vc | 3 ++- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ab3a45..0af4cb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-09-01 Eric Melski + + * win/makefile.vc (install-libraries): + * win/Makefile.in (install-libraries): + * unix/Makefile.in (install-libraries): Added tkPlatDecls.h to + list of header files to install. + + * generic/tk.h: Added #include "tkPlatDecls.h", which declares the + platform specific component of the public Tk stubs API's. + 2000-08-29 Eric Melski * win/tkWinMenu.c (DrawWindowsSystemBitmap): Use scratchDC diff --git a/generic/tk.h b/generic/tk.h index 29105e0..88c6fab 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk.h,v 1.46 2000/08/03 21:14:30 ericm Exp $ + * RCS: @(#) $Id: tk.h,v 1.47 2000/09/02 01:18:23 ericm Exp $ */ #ifndef _TK @@ -1353,7 +1353,7 @@ typedef int (Tk_SelectionProc) _ANSI_ARGS_((ClientData clientData, /* *-------------------------------------------------------------- * - * Exported procedures and variables. + * Platform independant exported procedures and variables. * *-------------------------------------------------------------- */ @@ -1361,6 +1361,12 @@ typedef int (Tk_SelectionProc) _ANSI_ARGS_((ClientData clientData, #include "tkDecls.h" /* + * Platform dependant exported procedures and variables. + */ + +#include "tkPlatDecls.h" + +/* * Tcl commands exported by Tk: */ diff --git a/unix/Makefile.in b/unix/Makefile.in index 4978a1b..6f81666 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.47 2000/06/30 06:38:40 ericm Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.48 2000/09/02 01:18:24 ericm Exp $ # Current Tk version; used in various names. @@ -501,7 +501,8 @@ install-libraries: chmod +x $(UNIX_DIR)/install-sh; \ fi @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \ + @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ + $(GENERIC_DIR)/tkPlatDecls.h ; \ do \ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ done; diff --git a/win/Makefile.in b/win/Makefile.in index 0909b21..cee6a9d 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.29 2000/07/18 18:17:47 mo Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.30 2000/09/02 01:18:24 ericm Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -437,8 +437,8 @@ install-libraries: fi; \ done; @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ - $(GENERIC_DIR)/tkIntXlibDecls.h ; \ + @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \ + $(GENERIC_DIR)/tkIntXlibDecls.h $(GENERIC_DIR)/tkDecls.h ; \ do \ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ done; diff --git a/win/makefile.vc b/win/makefile.vc index e656452..6e99c1c 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -4,7 +4,7 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # # Copyright (c) 1995-1997 Sun Microsystems, Inc. -# RCS: @(#) $Id: makefile.vc,v 1.36 2000/08/06 00:10:56 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.37 2000/09/02 01:18:24 ericm Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -348,6 +348,7 @@ install-libraries: @mkd "$(INCLUDE_INSTALL_DIR)\X11" copy "$(GENERICDIR)\tk.h" "$(INCLUDE_INSTALL_DIR)" copy "$(GENERICDIR)\tkDecls.h" "$(INCLUDE_INSTALL_DIR)" + copy "$(GENERICDIR)\tkPlatDecls.h" "$(INCLUDE_INSTALL_DIR)" copy "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)" xcopy "$(XLIBDIR)\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11" @mkd "$(SCRIPT_INSTALL_DIR)" -- cgit v0.12