Added a few cast to make it 68k-compatible.

diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c
index 991b567db129de8e6bb280c4ea8c4af00af28af9..3cdf377360892518442bc89a7a318cd4daaf158d 100644 (file)
--- 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 0df5d2b1ad9a1b9651ca41b37e3a773ea21627b0..f2d4be1e69c6fe32620cebea9c2c2e37211eca04 100644 (file)
--- 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);
 """