Changed [SG]etCRefCon to [SG]etControlReference
diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c
index 526338b..bbf5128 100644
--- a/Mac/Modules/ctl/Ctlmodule.c
+++ b/Mac/Modules/ctl/Ctlmodule.c
@@ -73,7 +73,7 @@
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 @@
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 @@
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 @@
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 3b32164..f7f5df2 100644
--- a/Mac/Modules/ctl/ctlsupport.py
+++ b/Mac/Modules/ctl/ctlsupport.py
@@ -54,7 +54,7 @@
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 @@
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)