diff options
| author | das <das> | 2001-11-23 02:04:08 (GMT) |
|---|---|---|
| committer | das <das> | 2001-11-23 02:04:08 (GMT) |
| commit | aa409cc42da819e8ab1d081e7a1f175b33c1c2cf (patch) | |
| tree | 0d0864ac4fc0b0ff178f5869f1600d2c584109c8 /mac/tkMac.h | |
| parent | 5efa25f6e1ad2a687cac8c1caab6d8c10f978269 (diff) | |
| download | tk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.zip tk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.tar.gz tk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.tar.bz2 | |
** upport to 8.4 of mac code changes for 8.3.3 & various new
** changes for 8.4, some already backported to 8.3.4 (patch #435660)
see ChangeLog for details
Diffstat (limited to 'mac/tkMac.h')
| -rw-r--r-- | mac/tkMac.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/mac/tkMac.h b/mac/tkMac.h index e23e424..07b22e9 100644 --- a/mac/tkMac.h +++ b/mac/tkMac.h @@ -8,23 +8,27 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMac.h,v 1.7 1999/05/22 06:32:05 jingham Exp $ + * RCS: @(#) $Id: tkMac.h,v 1.8 2001/11/23 02:05:24 das Exp $ */ #ifndef _TKMAC #define _TKMAC +#ifndef _TK +#include <tk.h> +#endif + +#ifndef _TKINT +#include "tkInt.h" +#endif + #include <Windows.h> #include <QDOffscreen.h> -#include "tkInt.h" -/* - * "export" is a MetroWerks specific pragma. It flags the linker that - * any symbols that are defined when this pragma is on will be exported - * to shared libraries that link with this library. - */ - -#pragma export on +#ifdef BUILD_tk +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLEXPORT +#endif /* * This variable is exported and can be used by extensions. It is the @@ -44,13 +48,9 @@ typedef int (Tk_MacEmbedMakeContainerExistProc) (Tk_Window window); typedef void (Tk_MacEmbedGetClipProc) (Tk_Window window, RgnHandle rgn); typedef void (Tk_MacEmbedGetOffsetInParentProc) (Tk_Window window, Point *ulCorner); -/* - * These functions are currently in tkMacInt.h. They are just copied over here - * so they can be exported. - */ - #include "tkPlatDecls.h" -#pragma export reset +# undef TCL_STORAGE_CLASS +# define TCL_STORAGE_CLASS DLLIMPORT #endif /* _TKMAC */ |