Skip to content

C
cpython
Kaydet (Commit) 25241d99 authored tarafından Jack Jansen's avatar Jack Jansen
Dosyalara gözat
Seçenekler

Fixed callback handling on 68K machines.

üst 12fe9fb1
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 16 deletions
Mac/Modules/waste/wastemodule.c
Dosyayı görüntüle @ 25241d99
...@@ -119,7 +119,10 @@ LongPt_New(LongPt *p) ...@@ -119,7 +119,10 @@ LongPt_New(LongPt *p)
/* Stuff for the callbacks: */ /* Stuff for the callbacks: */
static PyObject *callbackdict; static PyObject *callbackdict;
UniversalProcPtr upp_new_handler, upp_dispose_handler, upp_draw_handler, upp_click_handler; WENewObjectUPP upp_new_handler;
WEDisposeObjectUPP upp_dispose_handler;
WEDrawObjectUPP upp_draw_handler;
WEClickObjectUPP upp_click_handler;
static OSErr static OSErr
any_handler(WESelector what, WEObjectReference who, PyObject *args, PyObject **rv) any_handler(WESelector what, WEObjectReference who, PyObject *args, PyObject **rv)
...@@ -1826,10 +1829,10 @@ static PyObject *waste_WEInstallObjectHandler(_self, _args) ...@@ -1826,10 +1829,10 @@ static PyObject *waste_WEInstallObjectHandler(_self, _args)
&py_handler, &py_handler,
ExistingwasteObj_New, &we) ) return NULL; ExistingwasteObj_New, &we) ) return NULL;
if ( selector == weNewHandler ) handler = upp_new_handler; if ( selector == weNewHandler ) handler = (UniversalProcPtr)upp_new_handler;
else if ( selector == weDisposeHandler ) handler = upp_dispose_handler; else if ( selector == weDisposeHandler ) handler = (UniversalProcPtr)upp_dispose_handler;
else if ( selector == weDrawHandler ) handler = upp_draw_handler; else if ( selector == weDrawHandler ) handler = (UniversalProcPtr)upp_draw_handler;
else if ( selector == weClickHandler ) handler = upp_click_handler; else if ( selector == weClickHandler ) handler = (UniversalProcPtr)upp_click_handler;
else return PyMac_Error(weUndefinedSelectorErr); else return PyMac_Error(weUndefinedSelectorErr);
if ((key = Py_BuildValue("O&O&", if ((key = Py_BuildValue("O&O&",
...@@ -1914,9 +1917,9 @@ void initwaste() ...@@ -1914,9 +1917,9 @@ void initwaste()
if (callbackdict == NULL || PyDict_SetItemString(d, "callbacks", callbackdict) != 0) if (callbackdict == NULL || PyDict_SetItemString(d, "callbacks", callbackdict) != 0)
Py_FatalError("can't initialize Waste.callbackdict"); Py_FatalError("can't initialize Waste.callbackdict");
upp_new_handler = NewWENewObjectProc(my_new_handler); upp_new_handler = NewWENewObjectProc(my_new_handler);
upp_dispose_handler = NewWENewObjectProc(my_dispose_handler); upp_dispose_handler = NewWEDisposeObjectProc(my_dispose_handler);
upp_draw_handler = NewWENewObjectProc(my_draw_handler); upp_draw_handler = NewWEDrawObjectProc(my_draw_handler);
upp_click_handler = NewWENewObjectProc(my_click_handler); upp_click_handler = NewWEClickObjectProc(my_click_handler);
} }
......
Mac/Modules/waste/wastesupport.py
Dosyayı görüntüle @ 25241d99
...@@ -126,7 +126,10 @@ LongPt_New(LongPt *p) ...@@ -126,7 +126,10 @@ LongPt_New(LongPt *p)
/* Stuff for the callbacks: */ /* Stuff for the callbacks: */
static PyObject *callbackdict; static PyObject *callbackdict;
UniversalProcPtr upp_new_handler, upp_dispose_handler, upp_draw_handler, upp_click_handler; WENewObjectUPP upp_new_handler;
WEDisposeObjectUPP upp_dispose_handler;
WEDrawObjectUPP upp_draw_handler;
WEClickObjectUPP upp_click_handler;
static OSErr static OSErr
any_handler(WESelector what, WEObjectReference who, PyObject *args, PyObject **rv) any_handler(WESelector what, WEObjectReference who, PyObject *args, PyObject **rv)
...@@ -279,9 +282,9 @@ variablestuff = """ ...@@ -279,9 +282,9 @@ variablestuff = """
if (callbackdict == NULL || PyDict_SetItemString(d, "callbacks", callbackdict) != 0) if (callbackdict == NULL || PyDict_SetItemString(d, "callbacks", callbackdict) != 0)
Py_FatalError("can't initialize Waste.callbackdict"); Py_FatalError("can't initialize Waste.callbackdict");
upp_new_handler = NewWENewObjectProc(my_new_handler); upp_new_handler = NewWENewObjectProc(my_new_handler);
upp_dispose_handler = NewWENewObjectProc(my_dispose_handler); upp_dispose_handler = NewWEDisposeObjectProc(my_dispose_handler);
upp_draw_handler = NewWENewObjectProc(my_draw_handler); upp_draw_handler = NewWEDrawObjectProc(my_draw_handler);
upp_click_handler = NewWENewObjectProc(my_click_handler); upp_click_handler = NewWEClickObjectProc(my_click_handler);
""" """
...@@ -363,10 +366,10 @@ inshandler_body = """ ...@@ -363,10 +366,10 @@ inshandler_body = """
&py_handler, &py_handler,
ExistingwasteObj_New, &we) ) return NULL; ExistingwasteObj_New, &we) ) return NULL;
if ( selector == weNewHandler ) handler = upp_new_handler; if ( selector == weNewHandler ) handler = (UniversalProcPtr)upp_new_handler;
else if ( selector == weDisposeHandler ) handler = upp_dispose_handler; else if ( selector == weDisposeHandler ) handler = (UniversalProcPtr)upp_dispose_handler;
else if ( selector == weDrawHandler ) handler = upp_draw_handler; else if ( selector == weDrawHandler ) handler = (UniversalProcPtr)upp_draw_handler;
else if ( selector == weClickHandler ) handler = upp_click_handler; else if ( selector == weClickHandler ) handler = (UniversalProcPtr)upp_click_handler;
else return PyMac_Error(weUndefinedSelectorErr); else return PyMac_Error(weUndefinedSelectorErr);
if ((key = Py_BuildValue("O&O&", if ((key = Py_BuildValue("O&O&",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment