Menu
▾
▴
SF.net SVN: frontierkernel: [1209] Frontier/trunk/Common/source
|
From: <kar...@us...> - 2006-04-06 00:00:21
|
Revision: 1209 Author: karstenw Date: 2006-04-05 16:59:59 -0700 (Wed, 05 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1209&view=rev Log Message: ----------- parameter unused & name conflict fixes Modified Paths: -------------- Frontier/trunk/Common/source/about.c Frontier/trunk/Common/source/command.c Frontier/trunk/Common/source/file.c Frontier/trunk/Common/source/filealias.c Frontier/trunk/Common/source/frontierdebug.c Frontier/trunk/Common/source/langexternal.c Frontier/trunk/Common/source/langlist.c Frontier/trunk/Common/source/langquicktime.c Frontier/trunk/Common/source/langsystypes.c Frontier/trunk/Common/source/langwinipc.c Frontier/trunk/Common/source/langxml.c Frontier/trunk/Common/source/op.c Frontier/trunk/Common/source/osawindows.c Frontier/trunk/Common/source/pictverbs.c Frontier/trunk/Common/source/popup.c Frontier/trunk/Common/source/shellmouse.c Frontier/trunk/Common/source/shellprint.c Frontier/trunk/Common/source/shellverbs.c Frontier/trunk/Common/source/stringverbs.c Frontier/trunk/Common/source/tablefind.c Frontier/trunk/Common/source/wpengine.c Modified: Frontier/trunk/Common/source/about.c =================================================================== --- Frontier/trunk/Common/source/about.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/about.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -1276,7 +1276,8 @@ static boolean aboutmousedown (Point pt, tyclickflags flags) { - +#pragma unused (flags) + /* 1/24/91 dmb: to allow the home window to be dragged with a single click, even when it's not already the front window, the dontconsumefrontclicks @@ -1756,7 +1757,8 @@ boolean openabout (boolean flzoom, long ctreservebytes) { - +#pragma unused(flzoom) + /* 2.1b5 dmb: added ctreservebytes parameter. of non-zero, caller wants us to reserve space in the heap below the dialog record (during initialization) @@ -1800,7 +1802,8 @@ void closeabout (boolean flzoom, short minticks) { - +#pragma unused(flzoom) + hdlwindowinfo hinfo; if (findaboutwindow (&hinfo)) { Modified: Frontier/trunk/Common/source/command.c =================================================================== --- Frontier/trunk/Common/source/command.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/command.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -53,7 +53,8 @@ static boolean cmdsavestring (short stringnumber, Handle htext) { - +#pragma unused(stringnumber) + /* the cmd dialog only has one string, so we ignore the stringnumber param. @@ -90,7 +91,8 @@ static boolean cmdloadstring (short stringnumber, Handle *h) { - +#pragma unused(stringnumber) + /* 1/21/93 dmb: don't set superglobals manually anymore @@ -104,7 +106,8 @@ static boolean cmderrorroutine (long refcon, long lnum, short charnum, hdlhashtable *htable, bigstring bsname) { - +#pragma unused (refcon, htable) + /* a lang error occurred; select the offending text in the quickscript window */ @@ -137,7 +140,8 @@ static boolean cmdtexthit (Point pt) { - +#pragma unused (pt) + /* 2.1b6 dmb: use debugging context for zooming, if available */ @@ -149,7 +153,7 @@ minigetselstring (0, bs); - if (scriptgetdebuggingcontext (&hcontext)) /*gauranteed to be non-nil*/ + if (scriptgetdebuggingcontext (&hcontext)) /*guaranteed to be non-nil*/ pushhashtable (hcontext); langzoomobject (bs); Modified: Frontier/trunk/Common/source/file.c =================================================================== --- Frontier/trunk/Common/source/file.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/file.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -207,22 +207,22 @@ */ #ifdef MACVERSION - long filesize; + long lfilesize; - if (GetEOF (fnum, &filesize) != noErr) - filesize = 0; + if (GetEOF (fnum, &lfilesize) != noErr) + lfilesize = 0; - return (filesize); + return (lfilesize); #endif #ifdef WIN95VERSION - long filesize; + long lfilesize; - filesize = GetFileSize (fnum, NULL); - if (filesize == -1L) - filesize = 0L; + lfilesize = GetFileSize (fnum, NULL); + if (lfilesize == -1L) + lfilesize = 0L; - return (filesize); + return (lfilesize); #endif } /*filegetsize*/ @@ -403,17 +403,17 @@ indicated handle and return true if it worked. */ - register long filesize; + register long lfilesize; register Handle h; - filesize = filegetsize (fnum); + lfilesize = filegetsize (fnum); - if (!newclearhandle (filesize, hreturned)) + if (!newclearhandle (lfilesize, hreturned)) return (false); h = *hreturned; /*copy into register*/ - if (!fileread (fnum, filesize, *h)) { + if (!fileread (fnum, lfilesize, *h)) { disposehandle (h); @@ -462,7 +462,9 @@ #endif //MACVERSION boolean flushvolumechanges (const tyfilespec *fs, hdlfilenum fnum) { -#ifdef MACVERSION +#ifdef MACVERSION +# pragma unused(fnum) + /* 4.1b7 dmb: was -- FlushVol (nil, (*fs).vRefNum); @@ -639,10 +641,11 @@ setfserrorparam (fs); /*in case error message takes a filename parameter*/ - if (flreadonly) perm = fsRdPerm; - else perm = fsRdWrPerm; - - + if (flreadonly) + perm = fsRdPerm; + else + perm = fsRdWrPerm; + errcode = FSpOpenDF (fs, perm, fnum); if (oserror (errcode)) { Modified: Frontier/trunk/Common/source/filealias.c =================================================================== --- Frontier/trunk/Common/source/filealias.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/filealias.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -262,17 +262,20 @@ ParamBlockRec cpb; OSErr err; Handle h; - - if (!FSpIsVolume(volSpec)) return false; - + + if (!FSpIsVolume(volSpec)) + return false; + pb.volumeParam.ioNamePtr = NULL; pb.volumeParam.ioVRefNum = volSpec->vRefNum; pb.volumeParam.ioVolIndex = 0; - + err = PBHGetVInfoSync(&pb); - if (err != noErr) return false; - - // set up for Control call + + if (err != noErr) + return false; + + // set up for Control call cpb.cntrlParam.ioCRefNum = pb.volumeParam.ioVDRefNum; cpb.cntrlParam.ioVRefNum = pb.volumeParam.ioVDrvInfo; Modified: Frontier/trunk/Common/source/frontierdebug.c =================================================================== --- Frontier/trunk/Common/source/frontierdebug.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/frontierdebug.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -216,6 +216,7 @@ static void logtodialog (char *str) { +#pragma unused(str) }/*logtodialog*/ Modified: Frontier/trunk/Common/source/langexternal.c =================================================================== --- Frontier/trunk/Common/source/langexternal.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/langexternal.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -2362,7 +2362,7 @@ } /*updateconfigsettings*/ -boolean langexternalgetconfig (tyvaluetype type, short configid, tyconfigrecord *config) { +boolean langexternalgetconfig (tyvaluetype type, short configid, tyconfigrecord *pconfig) { /* 5.0b9 dmb: expose functionality so user prefs hold in all contexts, @@ -2380,7 +2380,7 @@ fltryingtoupdate = false; } - return (shellgetconfig (configid, config)); + return (shellgetconfig (configid, pconfig)); } /*langexternalgetconfig*/ @@ -2911,15 +2911,21 @@ boolean langexternalsymbolchanged (hdlhashtable htable, const bigstring bsname, hdlhashnode hnode, boolean flvalue) { +#pragma unused(flvalue) return langexternalsymbolinserted (htable, bsname, hnode); } /*langexternalsymbolchanged*/ boolean langexternalsymbolinserted (hdlhashtable htable, const bigstring bsname, hdlhashnode hnode) { +#if !langexternalfind_optimization +# pragma unused (htable, bsname, hnode) +#endif - #if langexternalfind_optimization - if (hnode != nil && hnode != HNoNode && (**hnode).val.valuetype == externalvaluetype) { +#if langexternalfind_optimization + if ( hnode != nil + && hnode != HNoNode + && (**hnode).val.valuetype == externalvaluetype) { hdlexternalvariable hv = (hdlexternalvariable) (**hnode).val.data.externalvalue; Modified: Frontier/trunk/Common/source/langlist.c =================================================================== --- Frontier/trunk/Common/source/langlist.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/langlist.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -367,7 +367,7 @@ an array of keys for each type. */ - register short *pi = (short *) pints; + register short *lpi = (short *) pints; boolean flrecord = listtype == recordvaluetype; tyvaluerecord itemval; @@ -383,7 +383,7 @@ while (--ctints >= 0) { /*process each int in the array*/ - setintvalue (*pi++, &itemval); + setintvalue (*lpi++, &itemval); if (!langpushlistval (*intlist, nil, &itemval)) goto error; @@ -405,7 +405,7 @@ 2.1b2 dmb: pull out the array of short integers from the list */ - register short *pi = (short *) pints; + register short *lpi = (short *) pints; tyvaluerecord val; long ctitems; long n; @@ -427,7 +427,7 @@ if (!coercevalue (&val, intvaluetype)) return (false); - *pi++ = val.data.intvalue; + *lpi++ = val.data.intvalue; } return (true); @@ -447,7 +447,8 @@ static boolean nofunctioncallsvisit (hdltreenode hnode, void *refcon) { - +#pragma unused (refcon) + return ((**hnode).nodetype != functionop); } /*nofunctioncallsvisit*/ @@ -692,7 +693,8 @@ static boolean coercelistcontents (tyvaluerecord *val, tyvaluetype totype, hdllistrecord hlist, long ctitems) { - +#pragma unused(val) + /* 4.0b7 dmb: when list->totype coercion otherwise fails, we try to coerce each item in the list to totype. if we success, we'll return true even though the value we @@ -1254,7 +1256,8 @@ static boolean langvisitlistvaluesvisit (Handle hdata, ptrstring bskey, ptrvoid refcon) { - +#pragma unused (bskey) + /* 2004-11-04 aradke: helper for langvisitlistvalues, called from opvisitlist. */ Modified: Frontier/trunk/Common/source/langquicktime.c =================================================================== --- Frontier/trunk/Common/source/langquicktime.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/langquicktime.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -83,7 +83,8 @@ static boolean quicktimeopenverb (hdltreenode hp1, tyvaluerecord *v) { - +#pragma unused(v) + /* 7.0b4 PBS: Open a movie in the QuickTime player window. */ Modified: Frontier/trunk/Common/source/langsystypes.c =================================================================== --- Frontier/trunk/Common/source/langsystypes.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/langsystypes.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -154,7 +154,8 @@ static boolean findvaluevisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, ptrvoid valfind) { - +#pragma unused (bs, hnode) + return (val.data.longvalue == (long) valfind); //.data.longvalue } /*findvaluevisit*/ @@ -226,7 +227,8 @@ static boolean getostypevalnamevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { - +#pragma unused (hnode) + /* 3.0.2b1 dmb: we now look in all loaded app tables for a match when converting an terminology value (a string4 value) its name Modified: Frontier/trunk/Common/source/langwinipc.c =================================================================== --- Frontier/trunk/Common/source/langwinipc.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/langwinipc.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -69,7 +69,8 @@ boolean langwinipcerrorroutine (bigstring bs, ptrvoid refcon) { - +#pragma unused (refcon) + /* if an error occurs while processing a runscript verb, we want to return the text that would normally go into the langerror window as @@ -881,7 +882,14 @@ #endif -static boolean langkernelbuildparamlist (hdltreenode hcode, tyvaluerecord * listval, hdltreenode *hparams, unsigned int * errarg) { +static boolean +langkernelbuildparamlist ( + hdltreenode hcode, + tyvaluerecord *listval, + hdltreenode *hparams, + unsigned int *errarg) +{ +#pragma unused (hcode) /* take all of the parameters in the incoming verb hverb and build a code Modified: Frontier/trunk/Common/source/langxml.c =================================================================== --- Frontier/trunk/Common/source/langxml.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/langxml.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -958,7 +958,8 @@ static boolean parseremotefunction (bigstring bs, ptrstring bsprotocol, ptrstring bsserver, short *port) { - +#pragma unused (port) + /* 5.0.2 dmb: given a string like "rpc2://betty.userland.com:81", set bsprotocol to "rpc2", server to "betty.userland.com" @@ -2329,7 +2330,8 @@ static boolean xmlvaltostring (tyvaluerecord xmlval, short indentlevel, boolean fltranslatestrings, Handle *string) { - +#pragma unused(indentlevel) + /* on valToString (val, indentlevel=0) { //http://www.microsoft.com/standards/xml/xmldata.htm#ComplexTypes \xC7Return an XML-Data representation of a Frontier value Modified: Frontier/trunk/Common/source/op.c =================================================================== --- Frontier/trunk/Common/source/op.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/op.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -354,7 +354,8 @@ static boolean opfindoffsetvisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (refcon) + bigstring bs; short len; @@ -1130,7 +1131,8 @@ static boolean opmovetovisit (hdlheadrecord hnode, ptrvoid refcon) { - +#pragma unused (refcon) + (**outlinedata).hbarcursor = hnode; /*move cursor to first headline encountered*/ return (false); /*stop visiting*/ @@ -1704,7 +1706,8 @@ void opsetcursorinfo (long row, short col) { - +#pragma unused (col) + /* translate a row and column position into the outline's internal data structure. Modified: Frontier/trunk/Common/source/osawindows.c =================================================================== --- Frontier/trunk/Common/source/osawindows.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/osawindows.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -97,8 +97,14 @@ static boolean removewindowsharinghandlers (void); -static pascal ComponentResult handlewindoweventcommand (Handle hglobals, EventRecord *ev, tyWindowSharingGlobals *wsGlobals) { - +static pascal ComponentResult +handlewindoweventcommand ( + Handle hglobals, + EventRecord *ev, + tyWindowSharingGlobals *pwsGlobals) +{ +#pragma unused (hglobals) + boolean flcloseallwindows = false; WindowPtr w; boolean fl = false; @@ -161,7 +167,7 @@ shellpopglobals (); - (*wsGlobals).flcloseallwindows = flcloseallwindows; /****/ + (*pwsGlobals).flcloseallwindows = flcloseallwindows; /****/ /* processyield (); @@ -172,19 +178,22 @@ static pascal ComponentResult windowiscardcommand (Handle hglobals, WindowPtr w) { - +#pragma unused (hglobals) + return (isshellwindow (w)); } /*windowiscardcommand*/ static pascal ComponentResult closewindowcommand (Handle hglobals, WindowPtr w) { - +#pragma unused (hglobals) + return (shellclosewindow (w)); } /*closewindowcommand*/ static pascal ComponentResult windoweditcommand (Handle hglobals, short editcmd) { - +#pragma unused (hglobals) + register WindowPtr w; register boolean fl; @@ -204,10 +213,16 @@ } /*windoweditcommand*/ -static pascal ComponentResult windowopencommand (Handle hglobals, Handle h, short flscripted, Str255 windowname, Point pt, uisEventCallback filter) { - - #pragma unused (flscripted, windowname, pt, filter) - +static pascal ComponentResult +windowopencommand ( + Handle hglobals, + Handle h, + short flscripted, + Str255 windowname, + Point pt, + uisEventCallback filter) { +#pragma unused (hglobals, flscripted, windowname, pt, filter) + /* 2.1b8 dmb: new routine so client can open window at will */ @@ -262,7 +277,8 @@ static pascal OSErr handleselectwindow (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { - +#pragma unused (reply, refcon) + /* handle the window select event in the current application context. Modified: Frontier/trunk/Common/source/pictverbs.c =================================================================== --- Frontier/trunk/Common/source/pictverbs.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/pictverbs.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -107,7 +107,7 @@ boolean pictverbgettypestring (hdlexternalvariable hvariable, bigstring bs) { - +#pragma unused (hvariable) getstringlist (pictstringlist, picttypestring, bs); return (true); @@ -115,7 +115,8 @@ static boolean pictdisposevariable (hdlexternalvariable hvariable, boolean fldisk) { - +#pragma unused (fldisk) + return (pictdisposerecord ((hdlpictrecord) (**hvariable).variabledata)); } /*pictdisposevariable*/ @@ -434,7 +435,8 @@ boolean pictverbpacktotext (hdlexternalvariable h, Handle htext) { - +#pragma unused(h) + bigstring bs; getstringlist (pictstringlist, picttextstring, bs); @@ -464,7 +466,8 @@ boolean pictverbgetdisplaystring (hdlexternalvariable h, bigstring bs) { - +#pragma unused(h) + /* get string for table display. variable is in memory */ @@ -1021,7 +1024,8 @@ boolean pictverbfind (hdlexternalvariable hvariable, boolean *flzoom) { - +#pragma unused(flzoom, hvariable) + return (false); } /*pictverbfind*/ @@ -1067,7 +1071,8 @@ static boolean pictprint (short pagenumber) { - +#pragma unused (pagenumber) + register hdlpictrecord hp = pictdata; register PicHandle macpicture = (**hp).macpicture; register boolean fleval; Modified: Frontier/trunk/Common/source/popup.c =================================================================== --- Frontier/trunk/Common/source/popup.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/popup.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -296,109 +296,118 @@ #if TARGET_API_MAC_CARBON == 1 - static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, - UInt32 userData, SInt16 depth, Boolean isColorDev) { - - /* - 7.0b48 PBS: draw the label for a popup menu. - */ - - bigstring bs; - - pushstyle (popupfont, popupfontsize, 0); +static void +MyThemeButtonDrawCallback ( + const Rect *bounds, + ThemeButtonKind kind, + const ThemeButtonDrawInfo *info, + UInt32 userData, + SInt16 depth, + Boolean isColorDev) +{ +#pragma unused (kind, info, depth, isColorDev) - texthandletostring ((Handle) userData, bs); - - movepento ((*bounds).left, (*bounds).top + 10); - - pendrawstring (bs); - - popstyle (); - } /*MyThemeButtonDrawCallback*/ + /* + 7.0b48 PBS: draw the label for a popup menu. + */ + bigstring bs; + + pushstyle (popupfont, popupfontsize, 0); + + texthandletostring ((Handle) userData, bs); + + movepento ((*bounds).left, (*bounds).top + 10); + + pendrawstring (bs); + + popstyle (); + } /*MyThemeButtonDrawCallback*/ + #endif boolean drawpopup (Rect rpopup, bigstring bs, boolean flbitmap) { - - #if TARGET_API_MAC_CARBON == 1 - - Rect r; - Handle h; - ThemeButtonDrawUPP drawupp; - ThemeButtonDrawInfo drawinfo; - - drawupp = NewThemeButtonDrawUPP (MyThemeButtonDrawCallback); - - drawinfo.state = kThemeButtonOn; - - drawinfo.value = kThemeStateActive; - - drawinfo.adornment = 0; - - setrect (&r, rpopup.top, rpopup.left, rpopup.bottom + 1, rpopup.right + 1); - - eraserect (r); - - newtexthandle (bs, &h); - - DrawThemeButton (&r, kThemePopupButton, &drawinfo, nil, nil, drawupp, (unsigned long) h); - - //DisposeThemeButtonDrawUPP (MyThemeButtonDrawCallback); - DisposeThemeButtonDrawUPP (drawupp); - - return (true); +#if TARGET_API_MAC_CARBON == 1 +# pragma unused (flbitmap) - #else + Rect r; + Handle h; + ThemeButtonDrawUPP drawupp; + ThemeButtonDrawInfo drawinfo; + - Rect r; - - initpopupfont (); + drawupp = NewThemeButtonDrawUPP (MyThemeButtonDrawCallback); - setrect (&r, rpopup.top, rpopup.left, rpopup.bottom + 1, rpopup.right + 1); - - if (flbitmap) - flbitmap = openbitmap (r, getport ()); - - eraserect (r); - - r = rpopup; - - framerect (r); - - movepento (r.left + 1, r.bottom); - - pendrawline (r.right, r.bottom); - - pendrawline (r.right, r.top + 1); - - r.right -= popuparrowwidth; - - insetrect (&r, 4, 2); - - pushstyle (popupfont, popupfontsize, 0); - - movepento (r.left, r.bottom - globalfontinfo.descent - 1); - - ellipsize (bs, r.right - r.left); - - pendrawstring (bs); - - popstyle (); - - r = rpopup; - - insetrect (&r, 1, 1); - - r.left = r.right - popuparrowwidth; - - displaypopupicon (r, true); - - if (flbitmap) - closebitmap (getport ()); - - return (true); - #endif + drawinfo.state = kThemeButtonOn; + + drawinfo.value = kThemeStateActive; + + drawinfo.adornment = 0; + + setrect (&r, rpopup.top, rpopup.left, rpopup.bottom + 1, rpopup.right + 1); + + eraserect (r); + + newtexthandle (bs, &h); + + DrawThemeButton (&r, kThemePopupButton, &drawinfo, nil, nil, drawupp, (unsigned long) h); + + //DisposeThemeButtonDrawUPP (MyThemeButtonDrawCallback); + DisposeThemeButtonDrawUPP (drawupp); + + return (true); + +#else + + Rect r; + + initpopupfont (); + + setrect (&r, rpopup.top, rpopup.left, rpopup.bottom + 1, rpopup.right + 1); + + if (flbitmap) + flbitmap = openbitmap (r, getport ()); + + eraserect (r); + + r = rpopup; + + framerect (r); + + movepento (r.left + 1, r.bottom); + + pendrawline (r.right, r.bottom); + + pendrawline (r.right, r.top + 1); + + r.right -= popuparrowwidth; + + insetrect (&r, 4, 2); + + pushstyle (popupfont, popupfontsize, 0); + + movepento (r.left, r.bottom - globalfontinfo.descent - 1); + + ellipsize (bs, r.right - r.left); + + pendrawstring (bs); + + popstyle (); + + r = rpopup; + + insetrect (&r, 1, 1); + + r.left = r.right - popuparrowwidth; + + displaypopupicon (r, true); + + if (flbitmap) + closebitmap (getport ()); + + return (true); +#endif } /*drawpopup*/ Modified: Frontier/trunk/Common/source/shellmouse.c =================================================================== --- Frontier/trunk/Common/source/shellmouse.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/shellmouse.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -433,11 +433,14 @@ break; */ - if (TrackGoAway (w, mousept)) + if (TrackGoAway (w, mousept)) + { + // 2006-04-03 - kw --- brace for ambiguity warning if (keyboardstatus.floptionkey) shellcloseall (w, true); else shellclose (w, true); + } break; Modified: Frontier/trunk/Common/source/shellprint.c =================================================================== --- Frontier/trunk/Common/source/shellprint.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/shellprint.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -305,8 +305,8 @@ */ Rect - rpage, - rpaper; + rpage, + rpaper; //typrintinfo *dbgprintinfo = &shellprintinfo; @@ -773,12 +773,10 @@ shellpopglobals (); exit: - - - currentprintport = NULL; - + currentprintport = NULL; + return (fl); - + } /*shellprint*/ Modified: Frontier/trunk/Common/source/shellverbs.c =================================================================== --- Frontier/trunk/Common/source/shellverbs.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/shellverbs.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -1370,7 +1370,8 @@ static boolean editmenufunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) { - +#pragma unused (bserror) + /* 10/3/91 dmb: split off editMenu verbs from shell verbs Modified: Frontier/trunk/Common/source/stringverbs.c =================================================================== --- Frontier/trunk/Common/source/stringverbs.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/stringverbs.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -2127,19 +2127,19 @@ unlockhandle (x); if (vtranslate.data.flvalue) { /*return a hex string*/ - bigstring bs; + bigstring lbs; unsigned char enc[] = "0123456789abcdef"; long ix; Handle h; for(ix = 0; ix < 16; ix++) { - setstringcharacter (bs, 2*ix, enc[(int)((checksum[ix])/16)]); - setstringcharacter (bs, 2*ix+1, enc[(int)((checksum[ix])%16)]); + setstringcharacter (lbs, 2*ix, enc[(int)((checksum[ix])/16)]); + setstringcharacter (lbs, 2*ix+1, enc[(int)((checksum[ix])%16)]); }/*for*/ - setstringlength (bs, 32); + setstringlength (lbs, 32); - if (!newtexthandle (bs, &h)) + if (!newtexthandle (lbs, &h)) return (false); return (setheapvalue (h, stringvaluetype, v)); Modified: Frontier/trunk/Common/source/tablefind.c =================================================================== --- Frontier/trunk/Common/source/tablefind.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/tablefind.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -212,7 +212,8 @@ static boolean tablefindvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { - +#pragma unused (refcon) + /* 7/4/91 dmb: langexternalzoom now takes table/name pair instead of full path. Modified: Frontier/trunk/Common/source/wpengine.c =================================================================== --- Frontier/trunk/Common/source/wpengine.c 2006-04-05 23:51:45 UTC (rev 1208) +++ Frontier/trunk/Common/source/wpengine.c 2006-04-05 23:59:59 UTC (rev 1209) @@ -282,6 +282,9 @@ static void setdefaultstyles (boolean flprinting) { +#ifdef MACVERSION +# pragma unused (flprinting) +#endif short font, size, style; bigstring bsfont; @@ -1992,7 +1995,8 @@ static pascal void wptrackclick (hdlwprecord wp, Point pt) { - +#pragma unused(wp) + /* 12/16/91 dmb: update scrollbars every time. (don't need to check dirtyness, because no drawing occurs if unchanged.) @@ -2980,25 +2984,26 @@ boolean wpnewrecord (Rect r, hdlwprecord *hwprecord) { - +#pragma unused (r) + /* 3.0.4b8 dmb: set the scratchport */ bigstring bs; - tyconfigrecord config; + tyconfigrecord lconfig; register hdlwprecord hwp; Rect rclip; setemptystring (bs); - shellgetconfig (idwpconfig, &config); + shellgetconfig (idwpconfig, &lconfig); pushscratchport (); - pushstyle (config.defaultfont, config.defaultsize, config.defaultstyle); + pushstyle (lconfig.defaultfont, lconfig.defaultsize, lconfig.defaultstyle); - rclip = config.defaultwindowrect; + rclip = lconfig.defaultwindowrect; offsetrect (&rclip, -rclip.left, -rclip.top); @@ -3011,7 +3016,7 @@ if (hwp == nil) return (false); - (**hwp).windowrect = config.defaultwindowrect; + (**hwp).windowrect = lconfig.defaultwindowrect; (**hwp).fldirty = true; @@ -3261,11 +3266,13 @@ long newstartsel, newendsel; if (flextend) + { if (flwordwise) caretverb |= EXTEND_CARET_FLAG; else pgGetSelection (wpbuffer, &oldstartsel, &oldendsel); - + } + pgSetCaretPosition (wpbuffer, caretverb, true); if (flextend && !flwordwise) { @@ -3545,11 +3552,11 @@ case chbackspace: { - long newstartsel; + long lnewstartsel; undocode = undo_backspace; - wptraversehiddentext (left, &newstartsel); + wptraversehiddentext (left, &lnewstartsel); break; } @@ -3739,10 +3746,11 @@ static boolean wprulerclick (Point pt) { - +#pragma unused (pt) + boolean flrecalc = false; - #if flrulers +#if flrulers #endif @@ -3925,7 +3933,8 @@ boolean wpdelete (boolean flinserting) { - +#pragma unused (flinserting) + /* 12/31/91 dmb: added flinserting parameter -- needed to deterinate whether the undo of the deletion needs to redisplay or not @@ -4387,7 +4396,8 @@ boolean wpsearch (boolean flfromtop, boolean flcase, boolean flwords, boolean flwrap) { - +#pragma unused (flcase, flwords) + /* 9/12/91 dmb: supported flwrap parameter This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
