Modify makefile to add new file

3 files changed, 15 insertions, 25 deletions

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index e03b5aa..7befec3 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -372,8 +372,12 @@ TkpInit(
 		TCL_GLOBAL_ONLY|TCL_LIST_ELEMENT|TCL_APPEND_VALUE);
     }
 
+    Tk_MacOSXServices_Init();
+
     Tcl_CreateObjCommand(interp, "::tk::mac::standardAboutPanel",
 	    TkMacOSXStandardAboutPanelObjCmd, NULL, NULL);
+    Tcl_CreateObjCommand(interp, "::tk::mac::registerServiceWidget",
+	    TkMacOSXRegisterServiceWidgetObjCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "::tk::mac::iconBitmap",
 	    TkMacOSXIconBitmapObjCmd, NULL, NULL);
 
diff --git a/macosx/tkMacOSXServices.c b/macosx/tkMacOSXServices.c
index 9140486..00ec39f 100644
--- a/macosx/tkMacOSXServices.c
+++ b/macosx/tkMacOSXServices.c
@@ -155,7 +155,7 @@ int ServicesEventProc(Tcl_Event *event, int flags) {
 
 
 /* Register a specific widget to access the Services menu. */
-int RegisterServiceWidget (ClientData cd, Tcl_Interp *ip, int objc, Tcl_Obj *CONST objv[]) {
+int TkMacOSXRegisterServiceWidgetObjCmd (ClientData cd, Tcl_Interp *ip, int objc, Tcl_Obj *CONST objv[]) {
 
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
@@ -204,40 +204,22 @@ int RegisterServiceWidget (ClientData cd, Tcl_Interp *ip, int objc, Tcl_Obj *CON
 
 
 //initalize the package in the tcl interpreter, create tcl commands
-int Tclservices_Init (Tcl_Interp *interp) {
+int Tk_MacOSXServices_Init (Tcl_Interp *interp) {
 
-  //set up an autorelease pool
+  /* Set up an autorelease pool. */
   NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-  if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
-    return TCL_ERROR;  
-  }
-  if (Tk_InitStubs(interp, "8.5", 0) == NULL) {
-    return TCL_ERROR;
-  }
-
-
-  Tcl_CreateObjCommand(interp, "::tclservices::registerservicewidget", RegisterServiceWidget,(ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
- 
 
-  //initialize instance of TclServices to provide service functionality
-  TclService *service = [[TclService alloc] init];
-  myInterp = interp;
+  /* Initialize instance of TclServices to provide service functionality. */
+  TkService *service = [[TkService alloc] init];
+  Service_Interp = interp;
   [NSApp setServicesProvider:service];
 
-
-  if (Tcl_PkgProvide(interp, "tclservices", "1.0") != TCL_OK) {
-    return TCL_ERROR;
-  }
-
   [pool release];
       
   return TCL_OK;
 	
 }
 
-int Tclservices_SafeInit(Tcl_Interp *interp) {
-  return Tclservices_Init(interp);
-}
 
 
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 4652052..0868bf6 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -398,7 +398,7 @@ AQUA_OBJS = tkMacOSXBitmap.o tkMacOSXButton.o tkMacOSXClipboard.o \
 	tkMacOSXInit.o tkMacOSXKeyboard.o tkMacOSXKeyEvent.o tkMacOSXMenu.o \
 	tkMacOSXMenubutton.o tkMacOSXMenus.o tkMacOSXMouseEvent.o \
 	tkMacOSXNotify.o tkMacOSXRegion.o tkMacOSXScrlbr.o tkMacOSXSend.o \
-	tkMacOSXSubwindows.o tkMacOSXWindowEvent.o \
+	tkMacOSXServices.o tkMacOSXSubwindows.o tkMacOSXWindowEvent.o \
 	tkMacOSXWm.o tkMacOSXXStubs.o \
 	tkFileFilter.o tkMacWinMenu.o tkPointer.o tkUnix3d.o tkUnixScale.o \
 	xcolors.o xdraw.o xgc.o ximage.o xutil.o \
@@ -525,6 +525,7 @@ AQUA_SRCS = \
 	$(MAC_OSX_DIR)/tkMacOSXMenubutton.c $(MAC_OSX_DIR)/tkMacOSXMenus.c \
 	$(MAC_OSX_DIR)/tkMacOSXMouseEvent.c $(MAC_OSX_DIR)/tkMacOSXNotify.c \
 	$(MAC_OSX_DIR)/tkMacOSXRegion.c $(MAC_OSX_DIR)/tkMacOSXScrlbr.c \
+	$(MAC_OSX_DIR)/tkMacOSXServices.c \
 	$(MAC_OSX_DIR)/tkMacOSXSend.c $(MAC_OSX_DIR)/tkMacOSXSubwindows.c \
 	$(MAC_OSX_DIR)/tkMacOSXTest.c $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c \
 	$(MAC_OSX_DIR)/tkMacOSXWm.c $(MAC_OSX_DIR)/tkMacOSXXStubs.c \
@@ -1313,6 +1314,9 @@ tkMacOSXScrlbr.o: $(MAC_OSX_DIR)/tkMacOSXScrlbr.c
 tkMacOSXSend.o: $(MAC_OSX_DIR)/tkMacOSXSend.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXSend.c
 
+tkMacOSXServices.o: $(MAC_OSX_DIR)/tkMacOSXImage.c
+	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXServices.c
+
 tkMacOSXSubwindows.o: $(MAC_OSX_DIR)/tkMacOSXSubwindows.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXSubwindows.c