|
From: Andre R. <and...@us...> - 2004-10-29 20:22:22
|
Update of /cvsroot/frontierkernel/Frontier/Common/IOAToolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9280 Modified Files: ioapopup.c ioacolorpopup.c ioa.c ioabutton.c ioaradio.c ioascrollbar.c Log Message: Fixed GCC compiler warnings. Index: ioapopup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioapopup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ioapopup.c 23 Oct 2004 21:40:49 -0000 1.2 --- ioapopup.c 29 Oct 2004 20:22:01 -0000 1.3 *************** *** 98,101 **** --- 98,102 ---- typedef smalliconbits *ptrsmalliconbits, **hdlsmalliconbits; + #if !TARGET_API_MAC_CARBON static boolean plotsmallicon (Rect r, short iconlist, short iconnum, boolean flinvert) { *************** *** 104,108 **** short mode; BitMap bmap; ! WindowPtr w; GetPort (&w); --- 105,109 ---- short mode; BitMap bmap; ! GrafPtr w; GetPort (&w); *************** *** 142,154 **** return (true); } /*plotsmallicon*/ - - - static long texthandlewidth (Handle htext) { ! return (TextWidth (*htext, 0, GetHandleSize (htext))); ! } /*texthandlewidth*/ ! ! ! static void disposehandle (h) Handle h; { if (h != nil) DisposeHandle (h); --- 143,151 ---- return (true); } /*plotsmallicon*/ ! #endif ! ! ! static void disposehandle (Handle h) { if (h != nil) DisposeHandle (h); *************** *** 515,528 **** static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, ! bigstring bs, SInt16 depth, Boolean isColorDev) { /* 7.0b48 PBS: draw the label for a popup menu. */ pushstyle (geneva, 10, 0); movepento ((*bounds).left, (*bounds).top + 12); ! pendrawstring (bs); popstyle (); --- 512,528 ---- static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, ! UInt32 refcon, SInt16 depth, Boolean isColorDev) { /* 7.0b48 PBS: draw the label for a popup menu. */ + + StringPtr sptr = (StringPtr) refcon; + pushstyle (geneva, 10, 0); movepento ((*bounds).left, (*bounds).top + 12); ! pendrawstring (sptr); popstyle (); *************** *** 681,684 **** --- 681,686 ---- + #if 0 + static boolean xxxrecalcpopup (hdlobject h, boolean flmajorrecalc) { *************** *** 705,708 **** --- 707,712 ---- } /*xxxrecalcpopup*/ + #endif + static boolean getpopupinvalrect (hdlobject h, Rect *r) { Index: ioabutton.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioabutton.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ioabutton.c 23 Oct 2004 21:39:23 -0000 1.2 --- ioabutton.c 29 Oct 2004 20:22:02 -0000 1.3 *************** *** 108,112 **** static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, ! Handle htext, SInt16 depth, Boolean isColorDev) { /* --- 108,112 ---- static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, ! UInt32 refcon, SInt16 depth, Boolean isColorDev) { /* *************** *** 114,117 **** --- 114,118 ---- */ + Handle htext = (Handle) refcon; ThemeFontID idfont; bigstring fontname, bs; Index: ioacolorpopup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioacolorpopup.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ioacolorpopup.c 29 Oct 2004 00:09:35 -0000 1.3 --- ioacolorpopup.c 29 Oct 2004 20:22:02 -0000 1.4 *************** *** 94,97 **** --- 94,99 ---- + #if !TARGET_API_MAC_CARBON + static void getitemrect (short item, Rect *ritem) { *************** *** 142,146 **** } /*frameitem*/ ! static pascal void colormenuhandler (short msg, MenuHandle hmenu, Rect *menurect, Point pt, short *item) { --- 144,148 ---- } /*frameitem*/ ! static pascal void colormenuhandler (short msg, MenuHandle hmenu, Rect *menurect, Point pt, short *item) { *************** *** 270,274 **** #endif } /*colormenuhandler*/ ! static void DebugNum (long num) { --- 272,276 ---- #endif } /*colormenuhandler*/ ! static void DebugNum (long num) { *************** *** 281,285 **** } /*DebugNum*/ - #if !TARGET_API_MAC_CARBON #if !GENERATINGCFM --- 283,286 ---- *************** *** 477,480 **** --- 478,483 ---- + #if 0 + static boolean getcheckboxeditrect (hdlobject h, Rect *r) { *************** *** 485,488 **** --- 488,493 ---- return (true); /*it can be edited*/ } /*getcheckboxeditrect*/ + + #endif Index: ioaradio.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaradio.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ioaradio.c 23 Oct 2004 21:40:59 -0000 1.2 --- ioaradio.c 29 Oct 2004 20:22:02 -0000 1.3 *************** *** 117,121 **** static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, ! bigstring bs, SInt16 depth, Boolean isColorDev) { //pushstyle (geneva, 10, 0); --- 117,123 ---- static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, ! UInt32 refcon, SInt16 depth, Boolean isColorDev) { ! ! //StringPtr bs = (StringPtr) refcon; //pushstyle (geneva, 10, 0); *************** *** 163,167 **** DrawThemeButton (&r, kThemeRadioButton, &drawinfo, nil, nil, drawupp, (unsigned long) nil); - //DisposeThemeButtonDrawUPP (MyThemeButtonDrawCallback); DisposeThemeButtonDrawUPP (drawupp); } --- 165,168 ---- Index: ioascrollbar.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioascrollbar.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ioascrollbar.c 23 Oct 2004 21:41:20 -0000 1.2 --- ioascrollbar.c 29 Oct 2004 20:22:02 -0000 1.3 *************** *** 81,85 **** static boolean cleanscrollbar (hdlobject h, short textheight, short textwidth, Rect *r) { - hdlscrollbardata hdata = (hdlscrollbardata) (**h).objectdata; short height, width; --- 81,84 ---- Index: ioa.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioa.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ioa.c 23 Oct 2004 21:39:12 -0000 1.2 --- ioa.c 29 Oct 2004 20:22:02 -0000 1.3 *************** *** 261,265 **** */ ! char len; short newwidth; --- 261,265 ---- */ ! long len; short newwidth; *************** *** 267,271 **** return; ! len = bs [0]; /* current length in characters*/ width -= CharWidth ('É'); /* subtract width of ellipses*/ --- 267,271 ---- return; ! len = (long) bs [0]; /* current length in characters*/ width -= CharWidth ('É'); /* subtract width of ellipses*/ *************** *** 1328,1332 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP IOAcloseUPP = NewComponentFunctionUPP(IOAclose, IOAcloseProcInfo); result = CallComponentFunction(params, IOAcloseUPP); DisposeComponentFunctionUPP(IOAcloseUPP); --- 1328,1332 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP IOAcloseUPP = NewComponentFunctionUPP((ProcPtr) &IOAclose, IOAcloseProcInfo); result = CallComponentFunction(params, IOAcloseUPP); DisposeComponentFunctionUPP(IOAcloseUPP); *************** *** 1342,1346 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP IOAcandoUPP = NewComponentFunctionUPP(IOAcando, IOAcandoProcInfo); result = CallComponentFunction(params, IOAcandoUPP); DisposeComponentFunctionUPP(IOAcandoUPP); --- 1342,1346 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP IOAcandoUPP = NewComponentFunctionUPP((ProcPtr) &IOAcando, IOAcandoProcInfo); result = CallComponentFunction(params, IOAcandoUPP); DisposeComponentFunctionUPP(IOAcandoUPP); *************** *** 1355,1359 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP IOAversionUPP = NewComponentFunctionUPP(IOAversion, IOAversionProcInfo); result = CallComponentFunction(params, IOAversionUPP); DisposeComponentFunctionUPP(IOAversionUPP); --- 1355,1359 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP IOAversionUPP = NewComponentFunctionUPP((ProcPtr) &IOAversion, IOAversionProcInfo); result = CallComponentFunction(params, IOAversionUPP); DisposeComponentFunctionUPP(IOAversionUPP); *************** *** 1368,1372 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP getconfigcommandUPP = NewComponentFunctionUPP(getconfigcommand, getconfigcommandProcInfo); result = CallComponentFunction(params, getconfigcommandUPP); DisposeComponentFunctionUPP(getconfigcommandUPP); --- 1368,1372 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP getconfigcommandUPP = NewComponentFunctionUPP((ProcPtr) &getconfigcommand, getconfigcommandProcInfo); result = CallComponentFunction(params, getconfigcommandUPP); DisposeComponentFunctionUPP(getconfigcommandUPP); *************** *** 1381,1385 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP initobjectcommandUPP = NewComponentFunctionUPP(initobjectcommand, initobjectcommandProcInfo); result = CallComponentFunction(params, initobjectcommandUPP); DisposeComponentFunctionUPP(initobjectcommandUPP); --- 1381,1385 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP initobjectcommandUPP = NewComponentFunctionUPP((ProcPtr) &initobjectcommand, initobjectcommandProcInfo); result = CallComponentFunction(params, initobjectcommandUPP); DisposeComponentFunctionUPP(initobjectcommandUPP); *************** *** 1394,1398 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP drawobjectcommandUPP = NewComponentFunctionUPP(drawobjectcommand, drawobjectcommandProcInfo); result = CallComponentFunction(params, drawobjectcommandUPP); DisposeComponentFunctionUPP(drawobjectcommandUPP); --- 1394,1398 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP drawobjectcommandUPP = NewComponentFunctionUPP((ProcPtr) &drawobjectcommand, drawobjectcommandProcInfo); result = CallComponentFunction(params, drawobjectcommandUPP); DisposeComponentFunctionUPP(drawobjectcommandUPP); *************** *** 1407,1411 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP editobjectcommandUPP = NewComponentFunctionUPP(editobjectcommand, editobjectcommandProcInfo); result = CallComponentFunction(params, editobjectcommandUPP); DisposeComponentFunctionUPP(editobjectcommandUPP); --- 1407,1411 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP editobjectcommandUPP = NewComponentFunctionUPP((ProcPtr) &editobjectcommand, editobjectcommandProcInfo); result = CallComponentFunction(params, editobjectcommandUPP); DisposeComponentFunctionUPP(editobjectcommandUPP); *************** *** 1420,1424 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP keystrokecommandUPP = NewComponentFunctionUPP(keystrokecommand, keystrokecommandProcInfo); result = CallComponentFunction(params, keystrokecommandUPP); DisposeComponentFunctionUPP(keystrokecommandUPP); --- 1420,1424 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP keystrokecommandUPP = NewComponentFunctionUPP((ProcPtr) &keystrokecommand, keystrokecommandProcInfo); result = CallComponentFunction(params, keystrokecommandUPP); DisposeComponentFunctionUPP(keystrokecommandUPP); *************** *** 1433,1437 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP idleobjectcommandUPP = NewComponentFunctionUPP(idleobjectcommand, idleobjectcommandProcInfo); result = CallComponentFunction(params, idleobjectcommandUPP); DisposeComponentFunctionUPP(idleobjectcommandUPP); --- 1433,1437 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP idleobjectcommandUPP = NewComponentFunctionUPP((ProcPtr) &idleobjectcommand, idleobjectcommandProcInfo); result = CallComponentFunction(params, idleobjectcommandUPP); DisposeComponentFunctionUPP(idleobjectcommandUPP); *************** *** 1445,1449 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP clickobjectcommandUPP = NewComponentFunctionUPP(clickobjectcommand, clickobjectcommandProcInfo); result = CallComponentFunction(params, clickobjectcommandUPP); DisposeComponentFunctionUPP(clickobjectcommandUPP); --- 1445,1449 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP clickobjectcommandUPP = NewComponentFunctionUPP((ProcPtr) &clickobjectcommand, clickobjectcommandProcInfo); result = CallComponentFunction(params, clickobjectcommandUPP); DisposeComponentFunctionUPP(clickobjectcommandUPP); *************** *** 1457,1461 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP cleanupobjectcommandUPP = NewComponentFunctionUPP(cleanupobjectcommand, cleanupobjectcommandProcInfo); result = CallComponentFunction(params, cleanupobjectcommandUPP); DisposeComponentFunctionUPP(cleanupobjectcommandUPP); --- 1457,1461 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP cleanupobjectcommandUPP = NewComponentFunctionUPP((ProcPtr) &cleanupobjectcommand, cleanupobjectcommandProcInfo); result = CallComponentFunction(params, cleanupobjectcommandUPP); DisposeComponentFunctionUPP(cleanupobjectcommandUPP); *************** *** 1469,1473 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP recalcobjectcommandUPP = NewComponentFunctionUPP(recalcobjectcommand, recalcobjectcommandProcInfo); result = CallComponentFunction(params, recalcobjectcommandUPP); DisposeComponentFunctionUPP(recalcobjectcommandUPP); --- 1469,1473 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP recalcobjectcommandUPP = NewComponentFunctionUPP((ProcPtr) &recalcobjectcommand, recalcobjectcommandProcInfo); result = CallComponentFunction(params, recalcobjectcommandUPP); DisposeComponentFunctionUPP(recalcobjectcommandUPP); *************** *** 1481,1485 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP canreplicateobjectcommandUPP = NewComponentFunctionUPP(canreplicateobjectcommand, canreplicateobjectcommandProcInfo); result = CallComponentFunction(params, canreplicateobjectcommandUPP); DisposeComponentFunctionUPP(canreplicateobjectcommandUPP); --- 1481,1485 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP canreplicateobjectcommandUPP = NewComponentFunctionUPP((ProcPtr) &canreplicateobjectcommand, canreplicateobjectcommandProcInfo); result = CallComponentFunction(params, canreplicateobjectcommandUPP); DisposeComponentFunctionUPP(canreplicateobjectcommandUPP); *************** *** 1493,1497 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP catchreturncommandUPP = NewComponentFunctionUPP(catchreturncommand, catchreturncommandProcInfo); result = CallComponentFunction(params, catchreturncommandUPP); DisposeComponentFunctionUPP(catchreturncommandUPP); --- 1493,1497 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP catchreturncommandUPP = NewComponentFunctionUPP((ProcPtr) &catchreturncommand, catchreturncommandProcInfo); result = CallComponentFunction(params, catchreturncommandUPP); DisposeComponentFunctionUPP(catchreturncommandUPP); *************** *** 1505,1509 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP getinvalrectcommandUPP = NewComponentFunctionUPP(getinvalrectcommand, getinvalrectcommandProcInfo); result = CallComponentFunction(params, getinvalrectcommandUPP); DisposeComponentFunctionUPP(getinvalrectcommandUPP); --- 1505,1509 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP getinvalrectcommandUPP = NewComponentFunctionUPP((ProcPtr) &getinvalrectcommand, getinvalrectcommandProcInfo); result = CallComponentFunction(params, getinvalrectcommandUPP); DisposeComponentFunctionUPP(getinvalrectcommandUPP); *************** *** 1517,1521 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP geteditrectcommandUPP = NewComponentFunctionUPP(geteditrectcommand, geteditrectcommandProcInfo); result = CallComponentFunction(params, geteditrectcommandUPP); DisposeComponentFunctionUPP(geteditrectcommandUPP); --- 1517,1521 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP geteditrectcommandUPP = NewComponentFunctionUPP((ProcPtr) &geteditrectcommand, geteditrectcommandProcInfo); result = CallComponentFunction(params, geteditrectcommandUPP); DisposeComponentFunctionUPP(geteditrectcommandUPP); *************** *** 1529,1533 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP getvaluecommandUPP = NewComponentFunctionUPP(getvaluecommand, getvaluecommandProcInfo); result = CallComponentFunction(params, getvaluecommandUPP); DisposeComponentFunctionUPP(getvaluecommandUPP); --- 1529,1533 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP getvaluecommandUPP = NewComponentFunctionUPP((ProcPtr) &getvaluecommand, getvaluecommandProcInfo); result = CallComponentFunction(params, getvaluecommandUPP); DisposeComponentFunctionUPP(getvaluecommandUPP); *************** *** 1541,1545 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP setvaluecommandUPP = NewComponentFunctionUPP(setvaluecommand, setvaluecommandProcInfo); result = CallComponentFunction(params, setvaluecommandUPP); DisposeComponentFunctionUPP(setvaluecommandUPP); --- 1541,1545 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP setvaluecommandUPP = NewComponentFunctionUPP((ProcPtr) &setvaluecommand, setvaluecommandProcInfo); result = CallComponentFunction(params, setvaluecommandUPP); DisposeComponentFunctionUPP(setvaluecommandUPP); *************** *** 1553,1557 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP setcursorcommandUPP = NewComponentFunctionUPP(setcursorcommand, setcursorcommandProcInfo); result = CallComponentFunction(params, setcursorcommandUPP); DisposeComponentFunctionUPP(setcursorcommandUPP); --- 1553,1557 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP setcursorcommandUPP = NewComponentFunctionUPP((ProcPtr) &setcursorcommand, setcursorcommandProcInfo); result = CallComponentFunction(params, setcursorcommandUPP); DisposeComponentFunctionUPP(setcursorcommandUPP); *************** *** 1565,1569 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP unpackdatacommandUPP = NewComponentFunctionUPP(unpackdatacommand, unpackdatacommandProcInfo); result = CallComponentFunction(params, unpackdatacommandUPP); DisposeComponentFunctionUPP(unpackdatacommandUPP); --- 1565,1569 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP unpackdatacommandUPP = NewComponentFunctionUPP((ProcPtr) &unpackdatacommand, unpackdatacommandProcInfo); result = CallComponentFunction(params, unpackdatacommandUPP); DisposeComponentFunctionUPP(unpackdatacommandUPP); *************** *** 1577,1581 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP debugobjectcommandUPP = NewComponentFunctionUPP(debugobjectcommand, debugobjectcommandProcInfo); result = CallComponentFunction(params, debugobjectcommandUPP); DisposeComponentFunctionUPP(debugobjectcommandUPP); --- 1577,1581 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP debugobjectcommandUPP = NewComponentFunctionUPP((ProcPtr) &debugobjectcommand, debugobjectcommandProcInfo); result = CallComponentFunction(params, debugobjectcommandUPP); DisposeComponentFunctionUPP(debugobjectcommandUPP); *************** *** 1589,1593 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP getattributescommandUPP = NewComponentFunctionUPP(getattributescommand, getattributescommandProcInfo); result = CallComponentFunction(params, getattributescommandUPP); DisposeComponentFunctionUPP(getattributescommandUPP); --- 1589,1593 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP getattributescommandUPP = NewComponentFunctionUPP((ProcPtr) &getattributescommand, getattributescommandProcInfo); result = CallComponentFunction(params, getattributescommandUPP); DisposeComponentFunctionUPP(getattributescommandUPP); *************** *** 1601,1605 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP setattributescommandUPP = NewComponentFunctionUPP(setattributescommand, setattributescommandProcInfo); result = CallComponentFunction(params, setattributescommandUPP); DisposeComponentFunctionUPP(setattributescommandUPP); --- 1601,1605 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP setattributescommandUPP = NewComponentFunctionUPP((ProcPtr) &setattributescommand, setattributescommandProcInfo); result = CallComponentFunction(params, setattributescommandUPP); DisposeComponentFunctionUPP(setattributescommandUPP); *************** *** 1613,1617 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP geticoncommandUPP = NewComponentFunctionUPP(geticoncommand, geticoncommandProcInfo); result = CallComponentFunction(params, geticoncommandUPP); DisposeComponentFunctionUPP(geticoncommandUPP); --- 1613,1617 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP geticoncommandUPP = NewComponentFunctionUPP((ProcPtr) &geticoncommand, geticoncommandProcInfo); result = CallComponentFunction(params, geticoncommandUPP); DisposeComponentFunctionUPP(geticoncommandUPP); *************** *** 1625,1629 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP getcardcommandUPP = NewComponentFunctionUPP(getcardcommand, getcardcommandProcInfo); result = CallComponentFunction(params, getcardcommandUPP); DisposeComponentFunctionUPP(getcardcommandUPP); --- 1625,1629 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP getcardcommandUPP = NewComponentFunctionUPP((ProcPtr) &getcardcommand, getcardcommandProcInfo); result = CallComponentFunction(params, getcardcommandUPP); DisposeComponentFunctionUPP(getcardcommandUPP); *************** *** 1637,1641 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP packdatacommandUPP = NewComponentFunctionUPP(packdatacommand, packdatacommandProcInfo); result = CallComponentFunction(params, packdatacommandUPP); DisposeComponentFunctionUPP(packdatacommandUPP); --- 1637,1641 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP packdatacommandUPP = NewComponentFunctionUPP((ProcPtr) &packdatacommand, packdatacommandProcInfo); result = CallComponentFunction(params, packdatacommandUPP); DisposeComponentFunctionUPP(packdatacommandUPP); *************** *** 1649,1653 **** #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP disposedatacommandUPP = NewComponentFunctionUPP(disposedatacommand, disposedatacommandProcInfo); result = CallComponentFunction(params, disposedatacommandUPP); DisposeComponentFunctionUPP(disposedatacommandUPP); --- 1649,1653 ---- #if TARGET_API_MAC_CARBON { ! ComponentFunctionUPP disposedatacommandUPP = NewComponentFunctionUPP((ProcPtr) &disposedatacommand, disposedatacommandProcInfo); result = CallComponentFunction(params, disposedatacommandUPP); DisposeComponentFunctionUPP(disposedatacommandUPP); |