From 1b6e8214ab643fd79a0dfde6c5c4d286bb61a0a0 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Wed, 5 Apr 2000 21:30:57 +0000 Subject: Added a few cast to make it 68k-compatible. --- Mac/Modules/ctl/Ctlmodule.c | 10 +++++----- Mac/Modules/ctl/ctlsupport.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c index 991b567..3cdf377 100644 --- a/Mac/Modules/ctl/Ctlmodule.c +++ b/Mac/Modules/ctl/Ctlmodule.c @@ -1981,13 +1981,13 @@ setcallback(self, which, callback, uppp) char keybuf[9]; if ( which == kControlUserPaneDrawProcTag ) - *uppp = mydrawproc_upp; + *uppp = (UniversalProcPtr)mydrawproc_upp; else if ( which == kControlUserPaneIdleProcTag ) - *uppp = myidleproc_upp; + *uppp = (UniversalProcPtr)myidleproc_upp; else if ( which == kControlUserPaneHitTestProcTag ) - *uppp = myhittestproc_upp; + *uppp = (UniversalProcPtr)myhittestproc_upp; else if ( which == kControlUserPaneTrackingProcTag ) - *uppp = mytrackingproc_upp; + *uppp = (UniversalProcPtr)mytrackingproc_upp; else return -1; /* Only now do we test for clearing of the callback: */ @@ -2098,7 +2098,7 @@ void initCtl() mytracker_upp = NewControlActionProc(mytracker); mydrawproc_upp = NewControlUserPaneDrawProc(mydrawproc); - myidleproc_upp = NewControlUserPaneDrawProc(myidleproc); + myidleproc_upp = NewControlUserPaneIdleProc(myidleproc); myhittestproc_upp = NewControlUserPaneHitTestProc(myhittestproc); mytrackingproc_upp = NewControlUserPaneTrackingProc(mytrackingproc); diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py index 0df5d2b..f2d4be1 100644 --- a/Mac/Modules/ctl/ctlsupport.py +++ b/Mac/Modules/ctl/ctlsupport.py @@ -174,13 +174,13 @@ setcallback(self, which, callback, uppp) char keybuf[9]; if ( which == kControlUserPaneDrawProcTag ) - *uppp = mydrawproc_upp; + *uppp = (UniversalProcPtr)mydrawproc_upp; else if ( which == kControlUserPaneIdleProcTag ) - *uppp = myidleproc_upp; + *uppp = (UniversalProcPtr)myidleproc_upp; else if ( which == kControlUserPaneHitTestProcTag ) - *uppp = myhittestproc_upp; + *uppp = (UniversalProcPtr)myhittestproc_upp; else if ( which == kControlUserPaneTrackingProcTag ) - *uppp = mytrackingproc_upp; + *uppp = (UniversalProcPtr)mytrackingproc_upp; else return -1; /* Only now do we test for clearing of the callback: */ @@ -285,7 +285,7 @@ mytrackingproc(ControlHandle control, Point startPt, ControlActionUPP actionProc initstuff = initstuff + """ mytracker_upp = NewControlActionProc(mytracker); mydrawproc_upp = NewControlUserPaneDrawProc(mydrawproc); -myidleproc_upp = NewControlUserPaneDrawProc(myidleproc); +myidleproc_upp = NewControlUserPaneIdleProc(myidleproc); myhittestproc_upp = NewControlUserPaneHitTestProc(myhittestproc); mytrackingproc_upp = NewControlUserPaneTrackingProc(mytrackingproc); """ -- cgit v0.12