Merge trunk

Author: jan.nijtmans

ChangeLog

@@ -344,14 +344,14 @@ https://core.tcl-lang.org/itcl/timeline
 	* itclBase.c:
 	* itcl2TclOO.c:
 2010-03-19  Arnulf P. Wiedemann <wiede@users.sourceforge.net>
-	* configure.in:    	add missing include files for install,thanks to Reinhard Max for
+	* configure.in:		add missing include files for install,thanks to Reinhard Max for
 				the patch
 	* itclInfo.c:		removed "uplevel 1" in Itcl_BiInfoUnknownCmd.c, which made problems
 				with "info complete", reported by Reinhard Max
 	* itclMethod.c:		fixed bug, which caused core dump in CallItclObjectCmd, thanks to
 				Reinhard Max for the patch
 2010-03-06  Arnulf P. Wiedemann <wiede@users.sourceforge.net>
-	* itcl.decls:    	changed CONST in declarations to const
+	* itcl.decls:		changed CONST in declarations to const
 	* itclDecls.h:
 	* itclIntDecls.h
 	* itcl2TclOO.c:		adaption to typedef change in TclOO for TclOO_PreCallProc and

Makefile.in

@@ -306,7 +306,7 @@ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
 # you will have to modify the paths to reflect this:
 #
 # sample.$(OBJEXT): $(srcdir)/generic/sample.c
-# 	$(COMPILE) -c `@CYGPATH@ $(srcdir)/generic/sample.c` -o $@
+#	$(COMPILE) -c `@CYGPATH@ $(srcdir)/generic/sample.c` -o $@
 #
 # Setting the VPATH variable to a list of paths will cause the makefile
 # to look into these paths when resolving .c to .obj dependencies.

doc/RegisterC.3

@@ -87,10 +87,10 @@ for public variables.  Any body that starts with "\fB@\fR"
 is treated as the symbolic name for a C procedure.
 .PP
 Symbolic names are established by registering procedures via
-\fBItcl_RegisterC()\fR or \fBItcl_RegisterC2()\fR.  This is usually done
-in the \fBTcl_AppInit()\fR procedure, which is automatically called when
-the interpreter starts up.
-In the following example, the procedure \fCMy_FooCmd()\fR is registered
+\fBItcl_RegisterObjC()\fR or \fBItcl_RegisterObjC2()\fR or
+\fBItcl_RegisterC()\fR.  This is usually done in the \fBTcl_AppInit()\fR
+procedure, which is automatically called when the interpreter starts up.
+In the following example, the procedure \fCMy_FooObjCmd()\fR is registered
 with the symbolic name "foo".  This procedure can be referenced in
 the \fBbody\fR command as "\fC@foo\fR".
 .CS
@@ -102,7 +102,7 @@ Tcl_AppInit(interp)
         return TCL_ERROR;
     }
 
-    if (Itcl_RegisterC(interp, "foo", My_FooCmd) != TCL_OK) {
+    if (Itcl_RegisterObjC(interp, "foo", My_FooObjCmd) != TCL_OK) {
         return TCL_ERROR;
     }
 }

doc/body.n

@@ -55,10 +55,10 @@ to represent each argument.  This is the usual behavior for
 a Tcl-style proc.
 .PP
 Symbolic names for C procedures are established by registering
-procedures via \fBItcl_RegisterC()\fR.  This is usually done
+procedures via \fBItcl_RegisterObjC()\fR.  This is usually done
 in the \fBTcl_AppInit()\fR procedure, which is automatically called
 when the interpreter starts up.  In the following example,
-the procedure \fCMy_FooCmd()\fR is registered with the
+the procedure \fCMy_FooObjCmd()\fR is registered with the
 symbolic name "foo".  This procedure can be referenced in
 the \fBbody\fR command as "\fC@foo\fR".
 .CS
@@ -70,7 +70,7 @@ Tcl_AppInit(interp)
         return TCL_ERROR;
     }
 
-    if (Itcl_RegisterC(interp, "foo", My_FooCmd) != TCL_OK) {
+    if (Itcl_RegisterObjC(interp, "foo", My_FooObjCmd) != TCL_OK) {
         return TCL_ERROR;
     }
 }

doc/class.n

@@ -504,9 +504,9 @@ for public variables.  Any body that starts with "\fB@\fR"
 is treated as the symbolic name for a C procedure.
 .PP
 Symbolic names are established by registering procedures via
-\fBItcl_RegisterC()\fR.  This is usually done in the \fBTcl_AppInit()\fR
+\fBItcl_RegisterObjC()\fR.  This is usually done in the \fBTcl_AppInit()\fR
 procedure, which is automatically called when the interpreter starts up.
-In the following example, the procedure \fCMy_FooCmd()\fR is registered
+In the following example, the procedure \fCMy_FooObjCmd()\fR is registered
 with the symbolic name "foo".  This procedure can be referenced in
 the \fBbody\fR command as "\fC@foo\fR".
 .PP
@@ -519,7 +519,7 @@ Tcl_AppInit(interp)
         return TCL_ERROR;
     }
 
-    if (Itcl_RegisterC(interp, "foo", My_FooCmd) != TCL_OK) {
+    if (Itcl_RegisterObjC(interp, "foo", My_FooObjCmd) != TCL_OK) {
         return TCL_ERROR;
     }
 }

doc/configbody.n

@@ -46,10 +46,10 @@ as the symbolic name for a C procedure.  Otherwise, it is
 treated as a Tcl command script.
 .PP
 Symbolic names for C procedures are established by registering
-procedures via \fBItcl_RegisterC()\fR.  This is usually done
+procedures via \fBItcl_RegisterObjC()\fR.  This is usually done
 in the \fBTcl_AppInit()\fR procedure, which is automatically called
 when the interpreter starts up.  In the following example,
-the procedure \fCMy_FooCmd()\fR is registered with the
+the procedure \fCMy_FooObjCmd()\fR is registered with the
 symbolic name "foo".  This procedure can be referenced in
 the \fBconfigbody\fR command as "\fC@foo\fR".
 .CS
@@ -61,7 +61,7 @@ Tcl_AppInit(interp)
         return TCL_ERROR;
     }
 
-    if (Itcl_RegisterC(interp, "foo", My_FooCmd) != TCL_OK) {
+    if (Itcl_RegisterObjC(interp, "foo", My_FooObjCmd) != TCL_OK) {
         return TCL_ERROR;
     }
 }

doc/itclextendedclass.n

@@ -508,9 +508,9 @@ for public variables.  Any body that starts with "\fB@\fR"
 is treated as the symbolic name for a C procedure.
 .PP
 Symbolic names are established by registering procedures via
-\fBItcl_RegisterC()\fR.  This is usually done in the \fBTcl_AppInit()\fR
+\fBItcl_RegisterObjC()\fR.  This is usually done in the \fBTcl_AppInit()\fR
 procedure, which is automatically called when the interpreter starts up.
-In the following example, the procedure \fCMy_FooCmd()\fR is registered
+In the following example, the procedure \fCMy_FooObjCmd()\fR is registered
 with the symbolic name "foo".  This procedure can be referenced in
 the \fBbody\fR command as "\fC@foo\fR".
 .PP
@@ -523,7 +523,7 @@ Tcl_AppInit(interp)
         return TCL_ERROR;
     }
 
-    if (Itcl_RegisterC(interp, "foo", My_FooCmd) != TCL_OK) {
+    if (Itcl_RegisterObjC(interp, "foo", My_FooObjCmd) != TCL_OK) {
         return TCL_ERROR;
     }
 }

doc/itclwidget.n

@@ -510,9 +510,9 @@ for public variables.  Any body that starts with "\fB@\fR"
 is treated as the symbolic name for a C procedure.
 .PP
 Symbolic names are established by registering procedures via
-\fBItcl_RegisterC()\fR.  This is usually done in the \fBTcl_AppInit()\fR
+\fBItcl_RegisterObjC()\fR.  This is usually done in the \fBTcl_AppInit()\fR
 procedure, which is automatically called when the interpreter starts up.
-In the following example, the procedure \fCMy_FooCmd()\fR is registered
+In the following example, the procedure \fCMy_FooObjCmd()\fR is registered
 with the symbolic name "foo".  This procedure can be referenced in
 the \fBbody\fR command as "\fC@foo\fR".
 .PP
@@ -525,7 +525,7 @@ Tcl_AppInit(interp)
         return TCL_ERROR;
     }
 
-    if (Itcl_RegisterC(interp, "foo", My_FooCmd) != TCL_OK) {
+    if (Itcl_RegisterObjC(interp, "foo", My_FooObjCmd) != TCL_OK) {
         return TCL_ERROR;
     }
 }

generic/itcl2TclOO.c

@@ -245,7 +245,7 @@ Itcl_PublicObjectCmd(
     } else {
 	Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
 	    "cannot access object-specific info without an object context",
-	    NULL);
+	    (char *)NULL);
 	return TCL_ERROR;
     }
     return result;