Remove Tk_MacOSXFindBundleResources, since it is moved to tcl.

4 files changed, 12 insertions, 73 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index 5308acb..dee5c13 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -11,7 +11,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.decls,v 1.15.2.2 2001/10/17 07:02:06 wolfsuit Exp $
+# RCS: @(#) $Id: tk.decls,v 1.15.2.3 2001/11/11 17:58:53 wolfsuit Exp $
 
 library tk
 
@@ -1290,17 +1290,9 @@ declare 8 aqua {
 }
 
 declare 9 aqua {
-    int Tk_MacOSXOpenBundleResources (Tcl_Interp *interp, \
-        char *bundleName, \
-        char *libraryPath, \
-        int  maxPathLen, \
-        int hasResourceFile)
-}
-
-declare 10 aqua {
     void Tk_MacOSXSetupTkNotifier (void)
 }
 
-declare 11 aqua {
+declare 10 aqua {
     int Tk_MacOSXIsAppInFront (void)
 }
\ No newline at end of file
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 7c4642c..98f871e 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkIntDecls.h,v 1.13.2.2 2001/10/17 07:02:07 wolfsuit Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.13.2.3 2001/11/11 17:58:53 wolfsuit Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -734,9 +734,6 @@ typedef struct TkIntStubs {
 #ifdef MAC_TCL
     void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    void *reserved113;
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */
 #endif /* MAC_OSX_TK */
@@ -749,9 +746,6 @@ typedef struct TkIntStubs {
 #ifdef MAC_TCL
     TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    void *reserved114;
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */
 #endif /* MAC_OSX_TK */
@@ -764,9 +758,6 @@ typedef struct TkIntStubs {
 #ifdef MAC_TCL
     void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    void *reserved115;
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */
 #endif /* MAC_OSX_TK */
@@ -779,9 +770,6 @@ typedef struct TkIntStubs {
 #ifdef MAC_TCL
     void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    void *reserved116;
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */
 #endif /* MAC_OSX_TK */
@@ -794,9 +782,6 @@ typedef struct TkIntStubs {
 #ifdef MAC_TCL
     int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    void *reserved117;
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */
 #endif /* MAC_OSX_TK */
@@ -809,9 +794,6 @@ typedef struct TkIntStubs {
 #ifdef MAC_TCL
     void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    void *reserved118;
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */
 #endif /* MAC_OSX_TK */
@@ -824,9 +806,6 @@ typedef struct TkIntStubs {
 #ifdef MAC_TCL
     void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    void *reserved119;
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
 #endif /* MAC_OSX_TK */
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 583b020..c842b62 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkPlatDecls.h,v 1.6.6.2 2001/10/17 07:02:07 wolfsuit Exp $
+ * RCS: @(#) $Id: tkPlatDecls.h,v 1.6.6.3 2001/11/11 17:58:53 wolfsuit Exp $
  */
 
 #ifndef _TKPLATDECLS
@@ -112,13 +112,8 @@ EXTERN GWorldPtr	TkMacOSXGetDrawablePort _ANSI_ARGS_((
 EXTERN ControlRef	TkMacOSXGetRootControl _ANSI_ARGS_((
 				Drawable drawable));
 /* 9 */
-EXTERN int		Tk_MacOSXOpenBundleResources _ANSI_ARGS_((
-				Tcl_Interp * interp, char * bundleName, 
-				char * libraryPath, int maxPathLen, 
-				int hasResourceFile));
-/* 10 */
 EXTERN void		Tk_MacOSXSetupTkNotifier _ANSI_ARGS_((void));
-/* 11 */
+/* 10 */
 EXTERN int		Tk_MacOSXIsAppInFront _ANSI_ARGS_((void));
 #endif /* MAC_OSX_TK */
 
@@ -157,9 +152,8 @@ typedef struct TkPlatStubs {
     void (*tkMacOSXInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */
     GWorldPtr (*tkMacOSXGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 7 */
     ControlRef (*tkMacOSXGetRootControl) _ANSI_ARGS_((Drawable drawable)); /* 8 */
-    int (*tk_MacOSXOpenBundleResources) _ANSI_ARGS_((Tcl_Interp * interp, char * bundleName, char * libraryPath, int maxPathLen, int hasResourceFile)); /* 9 */
-    void (*tk_MacOSXSetupTkNotifier) _ANSI_ARGS_((void)); /* 10 */
-    int (*tk_MacOSXIsAppInFront) _ANSI_ARGS_((void)); /* 11 */
+    void (*tk_MacOSXSetupTkNotifier) _ANSI_ARGS_((void)); /* 9 */
+    int (*tk_MacOSXIsAppInFront) _ANSI_ARGS_((void)); /* 10 */
 #endif /* MAC_OSX_TK */
 } TkPlatStubs;
 
@@ -286,17 +280,13 @@ extern TkPlatStubs *tkPlatStubsPtr;
 #define TkMacOSXGetRootControl \
 	(tkPlatStubsPtr->tkMacOSXGetRootControl) /* 8 */
 #endif
-#ifndef Tk_MacOSXOpenBundleResources
-#define Tk_MacOSXOpenBundleResources \
-	(tkPlatStubsPtr->tk_MacOSXOpenBundleResources) /* 9 */
-#endif
 #ifndef Tk_MacOSXSetupTkNotifier
 #define Tk_MacOSXSetupTkNotifier \
-	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 10 */
+	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
 #endif
 #ifndef Tk_MacOSXIsAppInFront
 #define Tk_MacOSXIsAppInFront \
-	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 11 */
+	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
 #endif
 #endif /* MAC_OSX_TK */
 
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 1e1cf94..34c7f6e 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubInit.c,v 1.28.2.2 2001/10/17 07:10:46 wolfsuit Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.28.2.3 2001/11/11 17:58:53 wolfsuit Exp $
  */
 
 #include "tkInt.h"
@@ -181,9 +181,6 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_TCL
     TkClipBox, /* 113 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    NULL, /* 113 */
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     TkClipBox, /* 113 */
 #endif /* MAC_OSX_TK */
@@ -196,9 +193,6 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_TCL
     TkCreateRegion, /* 114 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    NULL, /* 114 */
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     TkCreateRegion, /* 114 */
 #endif /* MAC_OSX_TK */
@@ -211,9 +205,6 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_TCL
     TkDestroyRegion, /* 115 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    NULL, /* 115 */
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     TkDestroyRegion, /* 115 */
 #endif /* MAC_OSX_TK */
@@ -226,9 +217,6 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_TCL
     TkIntersectRegion, /* 116 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    NULL, /* 116 */
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     TkIntersectRegion, /* 116 */
 #endif /* MAC_OSX_TK */
@@ -241,9 +229,6 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_TCL
     TkRectInRegion, /* 117 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    NULL, /* 117 */
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     TkRectInRegion, /* 117 */
 #endif /* MAC_OSX_TK */
@@ -256,9 +241,6 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_TCL
     TkSetRegion, /* 118 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    NULL, /* 118 */
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     TkSetRegion, /* 118 */
 #endif /* MAC_OSX_TK */
@@ -271,9 +253,6 @@ TkIntStubs tkIntStubs = {
 #ifdef MAC_TCL
     TkUnionRectWithRegion, /* 119 */
 #endif /* MAC_TCL */
-#ifdef MAC_OSX_TCL
-    NULL, /* 119 */
-#endif /* MAC_OSX_TCL */
 #ifdef MAC_OSX_TK
     TkUnionRectWithRegion, /* 119 */
 #endif /* MAC_OSX_TK */
@@ -945,9 +924,8 @@ TkPlatStubs tkPlatStubs = {
     TkMacOSXInvalClipRgns, /* 6 */
     TkMacOSXGetDrawablePort, /* 7 */
     TkMacOSXGetRootControl, /* 8 */
-    Tk_MacOSXOpenBundleResources, /* 9 */
-    Tk_MacOSXSetupTkNotifier, /* 10 */
-    Tk_MacOSXIsAppInFront, /* 11 */
+    Tk_MacOSXSetupTkNotifier, /* 9 */
+    Tk_MacOSXIsAppInFront, /* 10 */
 #endif /* MAC_OSX_TK */
 };