From 6e6284bb83ef988ef46a9c4210c2c1caac07b43f Mon Sep 17 00:00:00 2001 From: das Date: Thu, 1 Jan 2004 00:34:56 +0000 Subject: * macosx/Wish.pbproj/project.pbxproj: added missing private headers to installed Tk.framework, so that tkInt.h can be included sucessfully from Tk.framework/PrivateHeaders. * generic/tkPort.h: corrected include of tkMacOSXPort.h --- ChangeLog | 9 ++++++++- generic/tkPort.h | 4 ++-- macosx/Wish.pbproj/project.pbxproj | 6 ++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1279bfa..b10746d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-12-31 Daniel Steffen + + * macosx/Wish.pbproj/project.pbxproj: added missing private headers + to installed Tk.framework, so that tkInt.h can be included + sucessfully from Tk.framework/PrivateHeaders. + * generic/tkPort.h: corrected include of tkMacOSXPort.h + 2003-12-17 Jim Ingham * macosx/tkMacOSXScrlbr.c: Reworking Vince's fix to [Bug 842952]. @@ -9,7 +16,7 @@ 2003-12-11 David Gravereaux - win/winMain.c: Backed-out yesterdays change. Reverted to 1.15 for + * win/winMain.c: Backed-out yesterdays change. Reverted to 1.15 for two reasons. 1) problem is best addressed in Tcl's DllMain() and 2) needs a MinGW custom assembly implimentation as it doesn't understand SEH syntax. diff --git a/generic/tkPort.h b/generic/tkPort.h index b07e22d..ec4b362 100644 --- a/generic/tkPort.h +++ b/generic/tkPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPort.h,v 1.3 2002/08/31 06:12:26 das Exp $ + * RCS: @(#) $Id: tkPort.h,v 1.3.2.1 2004/01/01 00:34:56 das Exp $ */ #ifndef _TKPORT @@ -29,7 +29,7 @@ # if defined(MAC_TCL) # include "tkMacPort.h" # elif defined(MAC_OSX_TK) -# include "../macosx/tkMacOSXPort.h" +# include "tkMacOSXPort.h" # else # include "../unix/tkUnixPort.h" # endif diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj index 1d6779f..4c0a85e 100644 --- a/macosx/Wish.pbproj/project.pbxproj +++ b/macosx/Wish.pbproj/project.pbxproj @@ -1909,6 +1909,9 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright fileRef = F537557B016C37A601DC9062; isa = PBXBuildFile; settings = { + ATTRIBUTES = ( + Private, + ); }; }; F53755F8016C390401DC9062 = { @@ -1975,6 +1978,9 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright fileRef = F5375543016C376E01DC9062; isa = PBXBuildFile; settings = { + ATTRIBUTES = ( + Private, + ); }; }; F5375603016C397D01DC9062 = { -- cgit v0.12