Convert TkpTestembedCmd and TkpTesttextCmd to Tcl_Obj-based commands.

5 files changed, 24 insertions, 33 deletions

diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index e2e05d2..1d66b82 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -563,15 +563,15 @@ int
 TkpTestembedCmd(
     ClientData clientData,	/* Main window for application. */
     Tcl_Interp *interp,		/* Current interpreter. */
-    int argc,			/* Number of arguments. */
-    const char **argv)		/* Argument strings. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])		/* Argument strings. */
 {
     int all;
     Container *containerPtr;
     Tcl_DString dString;
     char buffer[50];
 
-    if ((argc > 1) && (strcmp(argv[1], "all") == 0)) {
+    if ((objc > 1) && (strcmp(Tcl_GetString(objv[1]), "all") == 0)) {
 	all = 1;
     } else {
 	all = 0;
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index ffbb06d..8d51c33 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -221,7 +221,7 @@ OappHandler(
     Tcl_Interp *interp = (Tcl_Interp *) handlerRefcon;
 
     if (interp &&
-	    Tcl_GetCommandInfo(interp, "::tk::mac::OpenApplication", &dummy)){
+	    Tcl_FindCommand(interp, "::tk::mac::OpenApplication", NULL, 0)){
 	int code = Tcl_EvalEx(interp, "::tk::mac::OpenApplication", -1, TCL_EVAL_GLOBAL);
 	if (code != TCL_OK) {
 	    Tcl_BackgroundException(interp, code);
@@ -252,13 +252,12 @@ RappHandler(
     AppleEvent *reply,
     SRefCon handlerRefcon)
 {
-    Tcl_CmdInfo dummy;
     Tcl_Interp *interp = (Tcl_Interp *) handlerRefcon;
     ProcessSerialNumber thePSN = {0, kCurrentProcess};
     OSStatus err = ChkErr(SetFrontProcess, &thePSN);
 
-    if (interp && Tcl_GetCommandInfo(interp,
-	    "::tk::mac::ReopenApplication", &dummy)) {
+    if (interp && Tcl_FindCommand(interp,
+	    "::tk::mac::ReopenApplication", NULL, 0)) {
 	int code = Tcl_EvalEx(interp, "::tk::mac::ReopenApplication", -1, TCL_EVAL_GLOBAL);
 	if (code != TCL_OK){
 	    Tcl_BackgroundException(interp, code);
@@ -294,7 +293,7 @@ PrefsHandler(
     Tcl_Interp *interp = (Tcl_Interp *) handlerRefcon;
 
     if (interp &&
-	    Tcl_GetCommandInfo(interp, "::tk::mac::ShowPreferences", &dummy)){
+	    Tcl_FindCommand(interp, "::tk::mac::ShowPreferences", NULL, 0)){
 	int code = Tcl_EvalEx(interp, "::tk::mac::ShowPreferences", -1, TCL_EVAL_GLOBAL);
 	if (code != TCL_OK) {
 	    Tcl_BackgroundException(interp, code);
@@ -333,7 +332,6 @@ OdocHandler(
     long count, index;
     AEKeyword keyword;
     Tcl_DString command, pathName;
-    Tcl_CmdInfo dummy;
     int code;
 
     /*
@@ -342,7 +340,7 @@ OdocHandler(
      */
 
     if (!interp ||
-	    !Tcl_GetCommandInfo(interp, "::tk::mac::OpenDocument", &dummy)) {
+	    !Tcl_FindCommand(interp, "::tk::mac::OpenDocument", NULL, 0)) {
 	return noErr;
     }
 
@@ -433,7 +431,7 @@ PrintHandler(
      */
 
     if (!interp ||
-	    !Tcl_GetCommandInfo(interp, "::tk::mac::PrintDocument", &dummy)) {
+	    !Tcl_FindCommand(interp, "::tk::mac::PrintDocument", NULL, 0)) {
 	return noErr;
     }
 
@@ -623,8 +621,7 @@ ReallyKillMe(
     int flags)
 {
     Tcl_Interp *interp = ((KillEvent *) eventPtr)->interp;
-    Tcl_CmdInfo dummy;
-    int quit = Tcl_GetCommandInfo(interp, "::tk::mac::Quit", &dummy);
+    int quit = Tcl_FindCommand(interp, "::tk::mac::Quit", NULL, 0)!=NULL;
     int code = Tcl_EvalEx(interp, quit ? "::tk::mac::Quit" : "exit", -1, TCL_EVAL_GLOBAL);
 
     if (code != TCL_OK) {
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 881bf75..68b2c00 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -145,10 +145,9 @@ static Tcl_Obj *	GetWidgetDemoPath(Tcl_Interp *interp);
     SEL action = [anItem action];
 
     if (sel_isEqual(action, @selector(preferences:))) {
-	Tcl_CmdInfo dummy;
 
-	return (_eventInterp && Tcl_GetCommandInfo(_eventInterp,
-		"::tk::mac::ShowPreferences", &dummy));
+	return (_eventInterp && Tcl_FindCommand(_eventInterp,
+		"::tk::mac::ShowPreferences", NULL, 0));
     } else if (sel_isEqual(action, @selector(tkDemo:))) {
 	BOOL haveDemo = NO;
 
@@ -169,10 +168,8 @@ static Tcl_Obj *	GetWidgetDemoPath(Tcl_Interp *interp);
 
 - (void) orderFrontStandardAboutPanel: (id) sender
 {
-    Tcl_CmdInfo dummy;
-
-    if (!_eventInterp || !Tcl_GetCommandInfo(_eventInterp, "tkAboutDialog",
-	    &dummy) || (GetCurrentEventKeyModifiers() & optionKey)) {
+    if (!_eventInterp || !Tcl_FindCommand(_eventInterp, "tkAboutDialog",
+	    NULL, 0) || (GetCurrentEventKeyModifiers() & optionKey)) {
 	TkAboutDlg();
     } else {
 	int code = Tcl_EvalEx(_eventInterp, "tkAboutDialog", -1,
@@ -187,10 +184,8 @@ static Tcl_Obj *	GetWidgetDemoPath(Tcl_Interp *interp);
 
 - (void) showHelp: (id) sender
 {
-    Tcl_CmdInfo dummy;
-
-    if (!_eventInterp || !Tcl_GetCommandInfo(_eventInterp,
-	    "::tk::mac::ShowHelp", &dummy)) {
+    if (!_eventInterp || !Tcl_FindCommand(_eventInterp,
+	    "::tk::mac::ShowHelp", NULL, 0)) {
 	[super showHelp:sender];
     } else {
 	int code = Tcl_EvalEx(_eventInterp, "::tk::mac::ShowHelp", -1,
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 7d2b24e..1882ce6 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -18,8 +18,8 @@
  * Forward declarations of procedures defined later in this file:
  */
 
-static int		DebuggerCmd (ClientData dummy, Tcl_Interp *interp,
-			    int argc, const char **argv);
+static int		DebuggerObjCmd (ClientData dummy, Tcl_Interp *interp,
+			    int objc, Tcl_Obj *const objv[]);
 
 /*
  *----------------------------------------------------------------------
@@ -46,7 +46,7 @@ TkplatformtestInit(
      * Add commands for platform specific tests on MacOS here.
      */
 
-    Tcl_CreateCommand(interp, "debugger", DebuggerCmd,
+    Tcl_CreateObjCommand(interp, "debugger", DebuggerObjCmd,
 	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
 
     return TCL_OK;
@@ -55,7 +55,7 @@ TkplatformtestInit(
 /*
  *----------------------------------------------------------------------
  *
- * DebuggerCmd --
+ * DebuggerObjCmd --
  *
  *	This procedure simply calls the low level debugger.
  *
@@ -69,11 +69,11 @@ TkplatformtestInit(
  */
 
 static int
-DebuggerCmd(
+DebuggerObjCmd(
     ClientData clientData,		/* Not used. */
     Tcl_Interp *interp,			/* Not used. */
-    int argc,				/* Not used. */
-    const char **argv)			/* Not used. */
+    int objc,				/* Not used. */
+    Tcl_Obj *const objv[])			/* Not used. */
 {
     Debugger();
     return TCL_OK;
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 9402cbb..2e4a683 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -266,9 +266,8 @@ extern NSString *opaqueTag;
     const char *cmd = ([[notification name] isEqualToString:
 	    NSApplicationDidUnhideNotification] ?
 	    "::tk::mac::OnShow" : "::tk::mac::OnHide");
-    Tcl_CmdInfo dummy;
 
-    if (_eventInterp && Tcl_GetCommandInfo(_eventInterp, cmd, &dummy)) {
+    if (_eventInterp && Tcl_FindCommand(_eventInterp, cmd, NULL, 0)) {
 	int code = Tcl_EvalEx(_eventInterp, cmd, -1, TCL_EVAL_GLOBAL);
 
 	if (code != TCL_OK) {