|
From: Karsten W. <kar...@us...> - 2006-02-14 11:34:30
|
Update of /cvsroot/frontierkernel/Frontier/Common/IOAToolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21872 Modified Files: Tag: pre_int64_branch ioa.c ioabutton.c ioacolorpopup.c ioaedittext.c ioaframe.c ioaradio.c Log Message: compiler warning fixes Index: ioabutton.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioabutton.c,v retrieving revision 1.4.6.1 retrieving revision 1.4.6.2 diff -C2 -d -r1.4.6.1 -r1.4.6.2 *** ioabutton.c 31 Jan 2006 16:33:23 -0000 1.4.6.1 --- ioabutton.c 14 Feb 2006 11:34:22 -0000 1.4.6.2 *************** *** 300,304 **** static boolean recalcbutton (hdlobject h, boolean flmajorrecalc) { ! bigstring errorstring; Handle hvalue; --- 300,305 ---- static boolean recalcbutton (hdlobject h, boolean flmajorrecalc) { ! #pragma unused (flmajorrecalc) ! bigstring errorstring; Handle hvalue; *************** *** 316,320 **** static boolean clickbutton (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { ! IOArunbuttonscript (h); --- 317,322 ---- static boolean clickbutton (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { ! #pragma unused (listhead, pt, flshiftkey, fl2click) ! IOArunbuttonscript (h); Index: ioacolorpopup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioacolorpopup.c,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -C2 -d -r1.5 -r1.5.6.1 *** ioacolorpopup.c 11 Jan 2005 22:47:38 -0000 1.5 --- ioacolorpopup.c 14 Feb 2006 11:34:22 -0000 1.5.6.1 *************** *** 437,441 **** static boolean clickcolorpopup (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { ! hdlcolordata hdata = (hdlcolordata) (**h).objectdata; RGBColor rgb; --- 437,441 ---- static boolean clickcolorpopup (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { ! #pragma unused (listhead, flshiftkey, fl2click) hdlcolordata hdata = (hdlcolordata) (**h).objectdata; RGBColor rgb; *************** *** 475,479 **** static boolean canreplicatecolorpopup (hdlobject h) { ! return (true); } /*canreplicatecolorpopup*/ --- 475,479 ---- static boolean canreplicatecolorpopup (hdlobject h) { ! #pragma unused (h) return (true); } /*canreplicatecolorpopup*/ *************** *** 593,597 **** static boolean debugcolorpopup (hdlobject h, bigstring errorstring) { ! setstringlength (errorstring, 0); --- 593,597 ---- static boolean debugcolorpopup (hdlobject h, bigstring errorstring) { ! #pragma unused (h) setstringlength (errorstring, 0); *************** *** 727,731 **** static boolean recalccolorpopup (hdlobject h, boolean flmajorrecalc) { ! bigstring errorstring; Handle hrgbvalue; --- 727,731 ---- static boolean recalccolorpopup (hdlobject h, boolean flmajorrecalc) { ! #pragma unused (flmajorrecalc) bigstring errorstring; Handle hrgbvalue; Index: ioa.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioa.c,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** ioa.c 11 Jan 2005 22:47:38 -0000 1.4 --- ioa.c 14 Feb 2006 11:34:22 -0000 1.4.6.1 *************** *** 494,498 **** boolean IOAincolorwindow (hdlobject h) { ! return (true); /*need to fill this in*/ } /*IOAincolorwindow*/ --- 494,499 ---- boolean IOAincolorwindow (hdlobject h) { ! #pragma unused (h) ! return (true); /*need to fill this in*/ } /*IOAincolorwindow*/ *************** *** 525,529 **** static boolean defaultDebugObjectCallback (hdlobject h, bigstring errorstring) { ! IOAcopystring ("\pbad object type", errorstring); --- 526,530 ---- static boolean defaultDebugObjectCallback (hdlobject h, bigstring errorstring) { ! #pragma unused (h) IOAcopystring ("\pbad object type", errorstring); *************** *** 533,537 **** static boolean defaultRecalcObjectCallback (hdlobject h, boolean flmajorrecalc) { ! return (true); } /*defaultRecalcObjectCallback*/ --- 534,538 ---- static boolean defaultRecalcObjectCallback (hdlobject h, boolean flmajorrecalc) { ! #pragma unused (h, flmajorrecalc) return (true); } /*defaultRecalcObjectCallback*/ *************** *** 539,543 **** static boolean defaultClickObjectCallback (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { ! return (false); /*don't do a minor recalc*/ } /*defaultClickObjectCallback*/ --- 540,545 ---- static boolean defaultClickObjectCallback (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { ! #pragma unused (listhead, h, pt, flshiftkey, fl2click) ! return (false); /*don't do a minor recalc*/ } /*defaultClickObjectCallback*/ *************** *** 545,549 **** static boolean defaultSetObjectCursorCallback (hdlobject h, Point pt) { ! return (false); /*we accept the default cursor*/ } /*defaultSetObjectCursorCallback*/ --- 547,552 ---- static boolean defaultSetObjectCursorCallback (hdlobject h, Point pt) { ! #pragma unused (h, pt) ! return (false); /*we accept the default cursor*/ } /*defaultSetObjectCursorCallback*/ *************** *** 551,555 **** static boolean defaultCatchReturnCallback (hdlobject h) { ! return (false); /*we don't want to intercept the Return key*/ } /*defaultCatchReturnCallback*/ --- 554,558 ---- static boolean defaultCatchReturnCallback (hdlobject h) { ! #pragma unused (h) return (false); /*we don't want to intercept the Return key*/ } /*defaultCatchReturnCallback*/ *************** *** 557,561 **** static boolean defaultUnpackDataCallback (hdlobject h) { ! return (true); /*do nothing*/ } /*defaultUnpackDataCallback*/ --- 560,564 ---- static boolean defaultUnpackDataCallback (hdlobject h) { ! #pragma unused (h) return (true); /*do nothing*/ } /*defaultUnpackDataCallback*/ *************** *** 563,567 **** static boolean defaultAppleEventCallback (hdlobject h, AppleEvent *event) { ! return (true); /*do nothing*/ } /*defaultAppleEventCallback*/ --- 566,570 ---- static boolean defaultAppleEventCallback (hdlobject h, AppleEvent *event) { ! #pragma unused (h, event) return (true); /*do nothing*/ } /*defaultAppleEventCallback*/ *************** *** 580,584 **** static boolean defaultDisposeDataCallback (hdlobject h) { ! return (true); } /*defaultDisposeDataCallback*/ --- 583,587 ---- static boolean defaultDisposeDataCallback (hdlobject h) { ! #pragma unused (h) return (true); } /*defaultDisposeDataCallback*/ *************** *** 641,645 **** static pascal ComponentResult IOAclose (ComponentInstance self) { ! return (noErr); } /*IOAclose*/ --- 644,648 ---- static pascal ComponentResult IOAclose (ComponentInstance self) { ! #pragma unused (self) return (noErr); } /*IOAclose*/ *************** *** 1292,1296 **** //I changed this to plain pascal instead of static. Will this shoot things? static pascal ComponentResult IOAmain (ComponentParameters *params, Handle hstorage) { ! #endif --- 1295,1299 ---- //I changed this to plain pascal instead of static. Will this shoot things? static pascal ComponentResult IOAmain (ComponentParameters *params, Handle hstorage) { ! #endif Index: ioaframe.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaframe.c,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** ioaframe.c 11 Jan 2005 22:47:38 -0000 1.3 --- ioaframe.c 14 Feb 2006 11:34:22 -0000 1.3.6.1 *************** *** 175,179 **** static boolean debugframe (hdlobject h, bigstring errorstring) { ! setstringlength (errorstring, 0); --- 175,179 ---- static boolean debugframe (hdlobject h, bigstring errorstring) { ! #pragma unused (h) setstringlength (errorstring, 0); *************** *** 269,273 **** static boolean recalcframe (hdlobject h, boolean flmajorrecalc) { ! return (IOArecalcobjectvalue (h)); } /*recalcframe*/ --- 269,273 ---- static boolean recalcframe (hdlobject h, boolean flmajorrecalc) { ! #pragma unused (flmajorrecalc) return (IOArecalcobjectvalue (h)); } /*recalcframe*/ Index: ioaedittext.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaedittext.c,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** ioaedittext.c 11 Jan 2005 22:47:38 -0000 1.3 --- ioaedittext.c 14 Feb 2006 11:34:22 -0000 1.3.6.1 *************** *** 214,218 **** static boolean debugedittext (hdlobject h, bigstring errorstring) { ! setstringlength (errorstring, 0); --- 214,218 ---- static boolean debugedittext (hdlobject h, bigstring errorstring) { ! #pragma unused (h) setstringlength (errorstring, 0); *************** *** 257,261 **** static boolean recalcedittext (hdlobject h, boolean flmajorrecalc) { ! hdltextdata hdata = (hdltextdata) (**h).objectdata; --- 257,261 ---- static boolean recalcedittext (hdlobject h, boolean flmajorrecalc) { ! #pragma unused (flmajorrecalc) hdltextdata hdata = (hdltextdata) (**h).objectdata; *************** *** 302,306 **** static boolean clickedittext (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { ! hdlcard hc = (**h).owningcard; --- 302,306 ---- static boolean clickedittext (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { ! #pragma unused (listhead, fl2click) hdlcard hc = (**h).owningcard; *************** *** 319,323 **** static boolean setcursoredittext (hdlobject h, Point pt) { ! CursHandle hcursor; --- 319,323 ---- static boolean setcursoredittext (hdlobject h, Point pt) { ! #pragma unused (h, pt) CursHandle hcursor; *************** *** 356,360 **** static boolean idleedittext (hdlobject h) { ! IOAeditidle (IOAgetactiveeditrecord ()); --- 356,360 ---- static boolean idleedittext (hdlobject h) { ! #pragma unused (h) IOAeditidle (IOAgetactiveeditrecord ()); Index: ioaradio.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaradio.c,v retrieving revision 1.4.6.1 retrieving revision 1.4.6.2 diff -C2 -d -r1.4.6.1 -r1.4.6.2 *** ioaradio.c 2 Feb 2006 19:01:41 -0000 1.4.6.1 --- ioaradio.c 14 Feb 2006 11:34:22 -0000 1.4.6.2 *************** *** 118,134 **** #if TARGET_API_MAC_CARBON == 1 ! 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); ! //movepento ((*bounds).left, (*bounds).top + 10); ! ! //pendrawstring (bs); ! ! //popstyle (); ! } /*MyThemeButtonDrawCallback*/ #endif --- 118,141 ---- #if TARGET_API_MAC_CARBON == 1 ! static void ! MyThemeButtonDrawCallback ( ! const Rect *bounds, ! ThemeButtonKind kind, ! const ThemeButtonDrawInfo *info, ! UInt32 refcon, ! SInt16 depth, ! Boolean isColorDev) ! { ! #pragma unused(bounds, kind, info, refcon, depth, isColorDev) ! //StringPtr bs = (StringPtr) refcon; ! //pushstyle (geneva, 10, 0); ! ! //movepento ((*bounds).left, (*bounds).top + 10); ! ! //pendrawstring (bs); ! ! //popstyle (); ! } /*MyThemeButtonDrawCallback*/ #endif *************** *** 219,223 **** static boolean initradio (tyobject *obj) { ! return (true); /*nothing special, we do want to edit it*/ } /*initradio*/ --- 226,230 ---- static boolean initradio (tyobject *obj) { ! #pragma unused(obj) return (true); /*nothing special, we do want to edit it*/ } /*initradio*/ *************** *** 225,229 **** static boolean recalcradio (hdlobject h, boolean flmajorrecalc) { ! bigstring errorstring; Handle hboolvalue; --- 232,236 ---- static boolean recalcradio (hdlobject h, boolean flmajorrecalc) { ! #pragma unused(flmajorrecalc) bigstring errorstring; Handle hboolvalue; *************** *** 239,243 **** static boolean clickradio (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { ! /* the one you hit goes on, all others go off --- 246,250 ---- static boolean clickradio (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { ! #pragma unused(pt, flshiftkey, fl2click) /* the one you hit goes on, all others go off |