Changed [SG]etCRefCon to [SG]etControlReference

diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c
index 526338bf84a1ef39b05cc39738cc9b75535bb87b..bbf51284f63af88113fe4c737fe1e0e80c3b9466 100644 (file)
--- a/Mac/Modules/ctl/Ctlmodule.c
+++ b/Mac/Modules/ctl/Ctlmodule.c
@@ -73,7 +73,7 @@ PyObject *CtlObj_New(itself)
        it = PyObject_NEW(ControlObject, &Control_Type);
        if (it == NULL) return NULL;
        it->ob_itself = itself;
-       SetCRefCon(itself, (long)it);
+       SetControlReference(itself, (long)it);
        return (PyObject *)it;
 }
 CtlObj_Convert(v, p_itself)
@@ -92,7 +92,7 @@ CtlObj_Convert(v, p_itself)
 static void CtlObj_dealloc(self)
        ControlObject *self;
 {
-       if (self->ob_itself) SetCRefCon(self->ob_itself, (long)0); /* Make it forget about us */
+       if (self->ob_itself) SetControlReference(self->ob_itself, (long)0); /* Make it forget about us */
        PyMem_DEL(self);
 }
 
@@ -448,7 +448,7 @@ static PyObject *CtlObj_DisposeControl(_self, _args)
                if (!PyArg_ParseTuple(_args, ""))
                        return NULL;
                if ( _self->ob_itself ) {
-                       SetCRefCon(_self->ob_itself, (long)0); /* Make it forget about us */
+                       SetControlReference(_self->ob_itself, (long)0); /* Make it forget about us */
                        DisposeControl(_self->ob_itself);
                        _self->ob_itself = NULL;
                }
@@ -674,7 +674,7 @@ CtlObj_WhichControl(ControlHandle c)
        if (c == NULL)
                it = NULL;
        else
-               it = (PyObject *) GetCRefCon(c);
+               it = (PyObject *) GetControlReference(c);
        if (it == NULL || ((ControlObject *)it)->ob_itself != c)
                it = Py_None;
        Py_INCREF(it);

diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py
index 3b32164883181b918d576c409f77f89ae00e245f..f7f5df28e4fb10e767e4b18e0a59226a73c18a55 100644 (file)
--- a/Mac/Modules/ctl/ctlsupport.py
+++ b/Mac/Modules/ctl/ctlsupport.py
@@ -54,7 +54,7 @@ CtlObj_WhichControl(ControlHandle c)
        if (c == NULL)
                it = NULL;
        else
-               it = (PyObject *) GetCRefCon(c);
+               it = (PyObject *) GetControlReference(c);
        if (it == NULL || ((ControlObject *)it)->ob_itself != c)
                it = Py_None;
        Py_INCREF(it);
@@ -67,9 +67,9 @@ class MyObjectDefinition(GlobalObjectDefinition):
                Output("if (itself == NULL) return PyMac_Error(resNotFound);")
        def outputInitStructMembers(self):
                GlobalObjectDefinition.outputInitStructMembers(self)
-               Output("SetCRefCon(itself, (long)it);")
+               Output("SetControlReference(itself, (long)it);")
        def outputCleanupStructMembers(self):
-               Output("if (self->ob_itself) SetCRefCon(self->ob_itself, (long)0); /* Make it forget about us */")
+               Output("if (self->ob_itself) SetControlReference(self->ob_itself, (long)0); /* Make it forget about us */")
                
 # Create the generator groups and link them
 module = MacModule(MODNAME, MODPREFIX, includestuff, finalstuff, initstuff)