Menu
▾
▴
SF.net SVN: frontierkernel: [1219] Frontier/branches/Int64/build_VC2K5
|
From: <kar...@us...> - 2006-04-07 18:06:25
|
Revision: 1219 Author: karstenw Date: 2006-04-07 11:04:09 -0700 (Fri, 07 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1219&view=rev Log Message: ----------- merged changes from trunk(1218) to branch Modified Paths: -------------- Frontier/branches/Int64/Common/IOAToolkit/ioa.c Frontier/branches/Int64/Common/IOAToolkit/ioa.h Frontier/branches/Int64/Common/IOAToolkit/ioabutton.c Frontier/branches/Int64/Common/IOAToolkit/ioacheckbox.c Frontier/branches/Int64/Common/IOAToolkit/ioacolorpopup.c Frontier/branches/Int64/Common/IOAToolkit/ioaedittext.c Frontier/branches/Int64/Common/IOAToolkit/ioaframe.c Frontier/branches/Int64/Common/IOAToolkit/ioaicon.c Frontier/branches/Int64/Common/IOAToolkit/ioapicture.c Frontier/branches/Int64/Common/IOAToolkit/ioapopup.c Frontier/branches/Int64/Common/IOAToolkit/ioaradio.c Frontier/branches/Int64/Common/IOAToolkit/ioarect.c Frontier/branches/Int64/Common/IOAToolkit/ioascrollbar.c Frontier/branches/Int64/Common/IOAToolkit/ioastatic.c Frontier/branches/Int64/Common/IowaRuntime/Headers/iowaruntime.h Frontier/branches/Int64/Common/IowaRuntime/Source/iowacore.c Frontier/branches/Int64/Common/IowaRuntime/Source/iowaruntime.c Frontier/branches/Int64/Common/IowaRuntime/Source/iowascript.c Frontier/branches/Int64/Common/PCRE/pcre.c Frontier/branches/Int64/Common/Paige/headers/PAIGE.H Frontier/branches/Int64/Common/UserLandIACToolkit/land.c Frontier/branches/Int64/Common/UserLandIACToolkit/landgetparam.c Frontier/branches/Int64/Common/UserLandIACToolkit/landops.c Frontier/branches/Int64/Common/UserLandIACToolkit/landsystem7.c Frontier/branches/Int64/Common/headers/FDllCall.h Frontier/branches/Int64/Common/headers/WinSockNetEvents.h Frontier/branches/Int64/Common/headers/frontierconfig.h Frontier/branches/Int64/Common/headers/langdll.h Frontier/branches/Int64/Common/headers/memory.h Frontier/branches/Int64/Common/headers/process.h Frontier/branches/Int64/Common/source/FrontierWinMain.c Frontier/branches/Int64/Common/source/OpenTransportNetEvents.c Frontier/branches/Int64/Common/source/about.c Frontier/branches/Int64/Common/source/bitmaps.c Frontier/branches/Int64/Common/source/cancoon.c Frontier/branches/Int64/Common/source/cancoonpopup.c Frontier/branches/Int64/Common/source/cancoonwindow.c Frontier/branches/Int64/Common/source/claybrowserexpand.c Frontier/branches/Int64/Common/source/claybrowserstruc.c Frontier/branches/Int64/Common/source/claybrowservalidate.c Frontier/branches/Int64/Common/source/claycallbacks.c Frontier/branches/Int64/Common/source/claylinelayout.c Frontier/branches/Int64/Common/source/command.c Frontier/branches/Int64/Common/source/db.c Frontier/branches/Int64/Common/source/dbstats.c Frontier/branches/Int64/Common/source/dbverbs.c Frontier/branches/Int64/Common/source/dialogs.c Frontier/branches/Int64/Common/source/dockmenu.c Frontier/branches/Int64/Common/source/file.c Frontier/branches/Int64/Common/source/filealias.c Frontier/branches/Int64/Common/source/filelaunch.c Frontier/branches/Int64/Common/source/fileloop.c Frontier/branches/Int64/Common/source/fileops.c Frontier/branches/Int64/Common/source/filepath.c Frontier/branches/Int64/Common/source/fileverbs.c Frontier/branches/Int64/Common/source/frontierdebug.c Frontier/branches/Int64/Common/source/icon.c Frontier/branches/Int64/Common/source/kb.c Frontier/branches/Int64/Common/source/lang.c Frontier/branches/Int64/Common/source/langcard.c Frontier/branches/Int64/Common/source/langdll.c Frontier/branches/Int64/Common/source/langerrorwindow.c Frontier/branches/Int64/Common/source/langevaluate.c Frontier/branches/Int64/Common/source/langexternal.c Frontier/branches/Int64/Common/source/langhash.c Frontier/branches/Int64/Common/source/langhtml.c Frontier/branches/Int64/Common/source/langipc.c Frontier/branches/Int64/Common/source/langipcmenus.c Frontier/branches/Int64/Common/source/langlist.c Frontier/branches/Int64/Common/source/langmodeless.c Frontier/branches/Int64/Common/source/langpython.c Frontier/branches/Int64/Common/source/langquicktime.c Frontier/branches/Int64/Common/source/langregexp.c Frontier/branches/Int64/Common/source/langsystypes.c Frontier/branches/Int64/Common/source/langtrace.c Frontier/branches/Int64/Common/source/langtree.c Frontier/branches/Int64/Common/source/langvalue.c Frontier/branches/Int64/Common/source/langverbs.c Frontier/branches/Int64/Common/source/langwinipc.c Frontier/branches/Int64/Common/source/langxml.c Frontier/branches/Int64/Common/source/launch.c Frontier/branches/Int64/Common/source/mac.c Frontier/branches/Int64/Common/source/md5.c Frontier/branches/Int64/Common/source/memory.c Frontier/branches/Int64/Common/source/menu.c Frontier/branches/Int64/Common/source/menubar.c Frontier/branches/Int64/Common/source/menueditor.c Frontier/branches/Int64/Common/source/menupack.c Frontier/branches/Int64/Common/source/menuverbs.c Frontier/branches/Int64/Common/source/miniwindow.c Frontier/branches/Int64/Common/source/mouse.c Frontier/branches/Int64/Common/source/odbengine.c Frontier/branches/Int64/Common/source/op.c Frontier/branches/Int64/Common/source/opbuttons.c Frontier/branches/Int64/Common/source/opdisplay.c Frontier/branches/Int64/Common/source/opdraggingmove.c Frontier/branches/Int64/Common/source/opedit.c Frontier/branches/Int64/Common/source/opexpand.c Frontier/branches/Int64/Common/source/ophoist.c Frontier/branches/Int64/Common/source/opicons.c Frontier/branches/Int64/Common/source/opinit.c Frontier/branches/Int64/Common/source/opops.c Frontier/branches/Int64/Common/source/oppack.c Frontier/branches/Int64/Common/source/opprint.c Frontier/branches/Int64/Common/source/oprefcon.c Frontier/branches/Int64/Common/source/ops.c Frontier/branches/Int64/Common/source/opstructure.c Frontier/branches/Int64/Common/source/opverbs.c Frontier/branches/Int64/Common/source/opxml.c Frontier/branches/Int64/Common/source/osacomponent.c Frontier/branches/Int64/Common/source/osawindows.c Frontier/branches/Int64/Common/source/pictverbs.c Frontier/branches/Int64/Common/source/player.c Frontier/branches/Int64/Common/source/popup.c Frontier/branches/Int64/Common/source/process.c Frontier/branches/Int64/Common/source/quickdraw.c Frontier/branches/Int64/Common/source/scripts.c Frontier/branches/Int64/Common/source/services.c Frontier/branches/Int64/Common/source/shell.c Frontier/branches/Int64/Common/source/shellbuttons.c Frontier/branches/Int64/Common/source/shellcallbacks.c Frontier/branches/Int64/Common/source/shellfile.c Frontier/branches/Int64/Common/source/shelljuggler.c Frontier/branches/Int64/Common/source/shellmouse.c Frontier/branches/Int64/Common/source/shellprint.c Frontier/branches/Int64/Common/source/shellscroll.c Frontier/branches/Int64/Common/source/shellsysverbs.c Frontier/branches/Int64/Common/source/shellupdate.c Frontier/branches/Int64/Common/source/shellverbs.c Frontier/branches/Int64/Common/source/shellwindow.c Frontier/branches/Int64/Common/source/shellwindowmenu.c Frontier/branches/Int64/Common/source/shellwindowverbs.c Frontier/branches/Int64/Common/source/smallicon.c Frontier/branches/Int64/Common/source/sounds.c Frontier/branches/Int64/Common/source/strings.c Frontier/branches/Int64/Common/source/stringverbs.c Frontier/branches/Int64/Common/source/tablecompare.c Frontier/branches/Int64/Common/source/tabledisplay.c Frontier/branches/Int64/Common/source/tableexternal.c Frontier/branches/Int64/Common/source/tablefind.c Frontier/branches/Int64/Common/source/tableformats.c Frontier/branches/Int64/Common/source/tableops.c Frontier/branches/Int64/Common/source/tablepack.c Frontier/branches/Int64/Common/source/tablepopup.c Frontier/branches/Int64/Common/source/tablescrap.c Frontier/branches/Int64/Common/source/threads.c Frontier/branches/Int64/Common/source/timedate.c Frontier/branches/Int64/Common/source/uisharing.c Frontier/branches/Int64/Common/source/wpengine.c Frontier/branches/Int64/Common/source/wpverbs.c Frontier/branches/Int64/Common/source/zoom.c Frontier/branches/Int64/FrontierSDK/Toolkits/AppletToolkit/Headers/appletmemory.h Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iacapps.c Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iacasynch.c Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iacdouble.c Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iacnetwork.c Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iacops.c Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iacsysevents.c Frontier/branches/Int64/build_VC2K5/Frontier.sln Frontier/branches/Int64/build_VC2K5/Frontier.vcproj Added Paths: ----------- Frontier/branches/Int64/Common/Paige/PaigeWinVC8CRT.lib Property Changed: ---------------- Frontier/branches/Int64/build_VC2K3/ Frontier/branches/Int64/build_VC2K5/ Modified: Frontier/branches/Int64/Common/IOAToolkit/ioa.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioa.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioa.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -62,28 +62,13 @@ static tyioaconfigrecord config; - -void IOAfillchar (void *pfill, long ctfill, char chfill) { - - /* - do a mass memory fill -- copy ctfill chfills at pfill. - */ - - char *p = pfill; - long ct = ctfill; - char ch = chfill; - - while (ct--) *p++ = (char) ch; /*tight loop*/ - } /*IOAfillchar*/ - - void IOAclearbytes (void *pclear, long ctclear) { /* fill memory with 0's. */ - IOAfillchar (pclear, ctclear, (char) 0); + memset(pclear, 0, ctclear); } /*IOAclearbytes*/ @@ -493,7 +478,7 @@ boolean IOAincolorwindow (hdlobject h) { -#pragma unused (h) +#pragma unused(h) return (true); /*need to fill this in*/ } /*IOAincolorwindow*/ @@ -525,7 +510,8 @@ static boolean defaultDebugObjectCallback (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) + IOAcopystring ("\pbad object type", errorstring); return (false); @@ -533,39 +519,43 @@ static boolean defaultRecalcObjectCallback (hdlobject h, boolean flmajorrecalc) { -#pragma unused (h, flmajorrecalc) +#pragma unused(h, flmajorrecalc) + return (true); } /*defaultRecalcObjectCallback*/ static boolean defaultClickObjectCallback (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { -#pragma unused (listhead, h, pt, flshiftkey, fl2click) +#pragma unused(h, listhead, pt, flshiftkey, fl2click) return (false); /*don't do a minor recalc*/ } /*defaultClickObjectCallback*/ static boolean defaultSetObjectCursorCallback (hdlobject h, Point pt) { -#pragma unused (h, pt) +#pragma unused(h, pt) return (false); /*we accept the default cursor*/ } /*defaultSetObjectCursorCallback*/ static boolean defaultCatchReturnCallback (hdlobject h) { -#pragma unused (h) +#pragma unused(h) + return (false); /*we don't want to intercept the Return key*/ } /*defaultCatchReturnCallback*/ static boolean defaultUnpackDataCallback (hdlobject h) { -#pragma unused (h) +#pragma unused(h) + return (true); /*do nothing*/ } /*defaultUnpackDataCallback*/ static boolean defaultAppleEventCallback (hdlobject h, AppleEvent *event) { -#pragma unused (h, event) +#pragma unused(h, event) + return (true); /*do nothing*/ } /*defaultAppleEventCallback*/ @@ -582,13 +572,14 @@ static boolean defaultDisposeDataCallback (hdlobject h) { -#pragma unused (h) +#pragma unused(h) + return (true); } /*defaultDisposeDataCallback*/ static void callsetuproutine (setupcallback pcallback, tyioaconfigrecord *pconfig) { - +// 2006-04-03 - kw --- renamed parameter config -> pconfig IOAclearbytes (pconfig, longsizeof (tyioaconfigrecord)); (*pconfig).setValueFromScriptCallback = IOAsetobjectvalue; @@ -643,7 +634,8 @@ static pascal ComponentResult IOAclose (ComponentInstance self) { -#pragma unused (self) +#pragma unused(self) + return (noErr); } /*IOAclose*/ @@ -1294,9 +1286,7 @@ //Code change by Timothy Paustian Saturday, July 8, 2000 8:23:29 AM //I changed this to plain pascal instead of static. Will this shoot things? static pascal ComponentResult IOAmain (ComponentParameters *params, Handle hstorage) { -#if TARGET_API_MAC_CARBON -#pragma unused(hstorage) -#endif +#pragma unused (hstorage) #endif Modified: Frontier/branches/Int64/Common/IOAToolkit/ioa.h =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioa.h 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioa.h 2006-04-07 18:04:09 UTC (rev 1219) @@ -536,8 +536,6 @@ -void IOAfillchar (void *, long, char); - void IOAclearbytes (void *, long); short IOAmakemultiple (short, short); Modified: Frontier/branches/Int64/Common/IOAToolkit/ioabutton.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioabutton.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioabutton.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -67,7 +67,8 @@ static boolean canreplicatebutton (hdlobject h) { -#pragma unused (h) +#pragma unused(h) + return (true); /*it can be replicated*/ } /*canreplicatebutton*/ @@ -99,7 +100,8 @@ static boolean debugbutton (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) + setstringlength (errorstring, 0); return (true); @@ -107,20 +109,22 @@ #if TARGET_API_MAC_CARBON == 1 + static void MyThemeButtonDrawCallback ( - const Rect *bounds, - ThemeButtonKind kind, - const ThemeButtonDrawInfo *info, - UInt32 refcon, - SInt16 depth, - Boolean isColorDev) + const Rect *bounds, + ThemeButtonKind kind, + const ThemeButtonDrawInfo *info, + UInt32 refcon, + SInt16 depth, + Boolean isColorDev) { -#pragma unused (kind, info, depth, isColorDev) +#pragma unused(kind, info, depth, isColorDev) + /* 7.0b48 PBS: draw the label for a popup menu. */ - + Handle htext = (Handle) refcon; ThemeFontID idfont; bigstring fontname, bs; @@ -299,7 +303,7 @@ static boolean recalcbutton (hdlobject h, boolean flmajorrecalc) { -#pragma unused (flmajorrecalc) +#pragma unused(flmajorrecalc) bigstring errorstring; Handle hvalue; @@ -316,7 +320,7 @@ static boolean clickbutton (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { -#pragma unused (listhead, pt, flshiftkey, fl2click) +#pragma unused(listhead, pt, flshiftkey, fl2click) IOArunbuttonscript (h); Modified: Frontier/branches/Int64/Common/IOAToolkit/ioacheckbox.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioacheckbox.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioacheckbox.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -79,7 +79,7 @@ static boolean canreplicatecheckbox (hdlobject h) { -#pragma unused (h) +#pragma unused(h) return (true); /*it can be replicated*/ } /*canreplicatecheckbox*/ @@ -108,7 +108,7 @@ static boolean debugcheckbox (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) setstringlength (errorstring, 0); @@ -168,14 +168,15 @@ static boolean initcheckbox (tyobject *obj) { -#pragma unused (obj) +#pragma unused(obj) return (true); /*nothing special, we do want to edit it*/ } /*initcheckbox*/ static boolean recalccheckbox (hdlobject h, boolean flmajorrecalc) { -#pragma unused (flmajorrecalc) +#pragma unused(flmajorrecalc) + bigstring errorstring; Handle hboolvalue; @@ -189,7 +190,8 @@ static boolean clickcheckbox (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { -#pragma unused (listhead, pt, flshiftkey, fl2click) +#pragma unused(listhead, pt, flshiftkey, fl2click) + (**h).objectflag = !(**h).objectflag; (**(**h).owningcard).runtimevaluechanged = true; /*DW 9/19/95*/ Modified: Frontier/branches/Int64/Common/IOAToolkit/ioacolorpopup.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioacolorpopup.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioacolorpopup.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -436,7 +436,8 @@ static boolean clickcolorpopup (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { -#pragma unused (listhead, flshiftkey, fl2click) +#pragma unused(listhead, flshiftkey, fl2click) + hdlcolordata hdata = (hdlcolordata) (**h).objectdata; RGBColor rgb; @@ -474,7 +475,7 @@ static boolean canreplicatecolorpopup (hdlobject h) { -#pragma unused (h) +#pragma unused(h) return (true); } /*canreplicatecolorpopup*/ @@ -592,7 +593,7 @@ static boolean debugcolorpopup (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) setstringlength (errorstring, 0); return (true); @@ -726,7 +727,8 @@ static boolean recalccolorpopup (hdlobject h, boolean flmajorrecalc) { -#pragma unused (flmajorrecalc) +#pragma unused(flmajorrecalc) + bigstring errorstring; Handle hrgbvalue; Modified: Frontier/branches/Int64/Common/IOAToolkit/ioaedittext.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioaedittext.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioaedittext.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -213,7 +213,8 @@ static boolean debugedittext (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) + setstringlength (errorstring, 0); return (true); @@ -256,7 +257,8 @@ static boolean recalcedittext (hdlobject h, boolean flmajorrecalc) { -#pragma unused (flmajorrecalc) +#pragma unused(flmajorrecalc) + hdltextdata hdata = (hdltextdata) (**h).objectdata; if (!(**hdata).bullets) @@ -301,7 +303,8 @@ static boolean clickedittext (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { -#pragma unused (listhead, fl2click) +#pragma unused(listhead, fl2click) + hdlcard hc = (**h).owningcard; if (h != (**hc).activetextobject) { @@ -318,7 +321,8 @@ static boolean setcursoredittext (hdlobject h, Point pt) { -#pragma unused (h, pt) +#pragma unused(h, pt) + CursHandle hcursor; hcursor = GetCursor (iBeamCursor); @@ -355,7 +359,8 @@ static boolean idleedittext (hdlobject h) { -#pragma unused (h) +#pragma unused(h) + IOAeditidle (IOAgetactiveeditrecord ()); return (true); Modified: Frontier/branches/Int64/Common/IOAToolkit/ioaframe.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioaframe.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioaframe.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -174,7 +174,8 @@ static boolean debugframe (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) + setstringlength (errorstring, 0); return (true); @@ -268,7 +269,8 @@ static boolean recalcframe (hdlobject h, boolean flmajorrecalc) { -#pragma unused (flmajorrecalc) +#pragma unused(flmajorrecalc) + return (IOArecalcobjectvalue (h)); } /*recalcframe*/ Modified: Frontier/branches/Int64/Common/IOAToolkit/ioaicon.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioaicon.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioaicon.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -94,7 +94,7 @@ static boolean canreplicateicon (hdlobject h) { -#pragma unused (h) +#pragma unused(h) return (true); /*it can be replicated*/ } /*canreplicateicon*/ @@ -107,7 +107,7 @@ static boolean debugicon (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) setstringlength (errorstring, 0); @@ -211,7 +211,7 @@ static boolean recalciconobject (hdlobject h, boolean flmajorrecalc) { -#pragma unused (flmajorrecalc) +#pragma unused(flmajorrecalc) return (IOArecalcobjectvalue (h)); } /*recalciconobject*/ @@ -327,17 +327,10 @@ return (true); } /*unpackicondata*/ + +static boolean clickicon (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { +#pragma unused(listhead, pt, flshiftkey) -static boolean -clickicon ( - hdlobject listhead, - hdlobject h, - Point pt, - boolean flshiftkey, - boolean fl2click) -{ -#pragma unused (listhead, pt, flshiftkey) - hdlicondata hdata = (hdlicondata) (**h).objectdata; tyiconclickcallback lcallback = (**hdata).iconclick; Modified: Frontier/branches/Int64/Common/IOAToolkit/ioapicture.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioapicture.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioapicture.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -87,7 +87,7 @@ static boolean debugpicture (hdlobject h, bigstring errorstring) { #pragma unused(h) - + setstringlength (errorstring, 0); return (true); Modified: Frontier/branches/Int64/Common/IOAToolkit/ioapopup.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioapopup.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioapopup.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -385,12 +385,12 @@ (*r).bottom = (*r).top + height; - /*side-effect -- we use the popup width when drawing the object*/ - { + /*side-effect -- we use the popup width when drawing the object*/ { + hdlpopupdata lhdata = (hdlpopupdata) (**h).objectdata; - + (**lhdata).popupwidth = popupwidth; - } + } return (true); } /*cleanpopup*/ @@ -420,7 +420,7 @@ static boolean clickpopup (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { -#pragma unused (listhead, flshiftkey, fl2click) +#pragma unused(listhead, flshiftkey, fl2click) hdlpopupdata hdata = (hdlpopupdata) (**h).objectdata; hdlcard hc = (**h).owningcard; @@ -517,16 +517,9 @@ #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 (kind, info, depth, isColorDev) + static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, + UInt32 refcon, SInt16 depth, Boolean isColorDev) { +#pragma unused(kind, info, depth, isColorDev) /* 7.0b48 PBS: draw the label for a popup menu. @@ -679,14 +672,14 @@ return (true); /*we do want to edit it*/ } /*initpopup*/ - - + + static boolean recalcpopup (hdlobject h, boolean flmajorrecalc) { -#pragma unused (flmajorrecalc) +#pragma unused(flmajorrecalc) bigstring errorstring; Handle htoss; - + if (!IOAevalscript (h, (**h).objectrecalcscript, &htoss, (**h).objectlanguage, errorstring)) return (false); @@ -735,15 +728,15 @@ return (true); } /*getpopupinvalrect*/ - - + + static boolean canreplicatepopup (hdlobject h) { -#pragma unused (h) +#pragma unused(h) return (true); } /*canreplicatepopup*/ - + static boolean getpopupeditrect (hdlobject h, Rect *redit) { hdlpopupdata hdata = (hdlpopupdata) (**h).objectdata; @@ -776,7 +769,7 @@ static boolean debugpopup (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) setstringlength (errorstring, 0); Modified: Frontier/branches/Int64/Common/IOAToolkit/ioaradio.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioaradio.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioaradio.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -80,7 +80,8 @@ static boolean canreplicateradio (hdlobject h) { -#pragma unused (h) +#pragma unused(h) + return (true); /*it can be replicated*/ } /*canreplicateradio*/ @@ -108,7 +109,8 @@ static boolean debugradio (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) + setstringlength (errorstring, 0); return (true); @@ -117,18 +119,14 @@ #if TARGET_API_MAC_CARBON == 1 -static void -MyThemeButtonDrawCallback ( - const Rect *bounds, - ThemeButtonKind kind, - const ThemeButtonDrawInfo *info, - UInt32 refcon, - SInt16 depth, - Boolean isColorDev) -{ + 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; + //StringPtr bs = (StringPtr) refcon; + + //pushstyle (geneva, 10, 0); + //pushstyle (geneva, 10, 0); //movepento ((*bounds).left, (*bounds).top + 10); @@ -226,12 +224,14 @@ static boolean initradio (tyobject *obj) { #pragma unused(obj) + return (true); /*nothing special, we do want to edit it*/ } /*initradio*/ static boolean recalcradio (hdlobject h, boolean flmajorrecalc) { #pragma unused(flmajorrecalc) + bigstring errorstring; Handle hboolvalue; @@ -246,6 +246,7 @@ 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 */ Modified: Frontier/branches/Int64/Common/IOAToolkit/ioarect.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioarect.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioarect.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -82,13 +82,15 @@ static boolean canreplicaterect (hdlobject h) { -#pragma unused (h) +#pragma unused(h) + return (false); /*it can't be replicated*/ } /*canreplicaterect*/ static boolean getrecteditrect (hdlobject h, Rect *r) { -#pragma unused (h, r) +#pragma unused(h, r) + return (false); /*can't be edited*/ } /*getrecteditrect*/ @@ -100,7 +102,8 @@ static boolean debugrectobject (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) + setstringlength (errorstring, 0); return (true); @@ -181,7 +184,8 @@ static boolean clickrect (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { -#pragma unused (listhead, pt, flshiftkey, fl2click) +#pragma unused(listhead, pt, flshiftkey, fl2click) + IOArunbuttonscript (h); return (true); /*do a minor recalc*/ Modified: Frontier/branches/Int64/Common/IOAToolkit/ioascrollbar.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioascrollbar.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioascrollbar.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -81,7 +81,8 @@ static boolean cleanscrollbar (hdlobject h, short textheight, short textwidth, Rect *r) { -#pragma unused (textheight, textwidth) +#pragma unused(textwidth, textheight) + short height, width; if (!checkcontrolexists (h)) @@ -175,7 +176,9 @@ #endif static boolean clickscrollbar (hdlobject listhead, hdlobject h, Point pt, boolean flshiftkey, boolean fl2click) { -#pragma unused (listhead, flshiftkey, fl2click) +#pragma unused(listhead, flshiftkey, fl2click) + + // hdlscrollbardata hdata = (hdlscrollbardata) (**h).objectdata; hdlcard hc = (**h).owningcard; if (!checkcontrolexists (h)) @@ -297,7 +300,8 @@ static boolean recalcscrollbar (hdlobject h, boolean flmajorrecalc) { -#pragma unused (flmajorrecalc) +#pragma unused(flmajorrecalc) + return (IOArecalcobjectvalue (h)); } /*recalcscrollbar*/ @@ -311,13 +315,15 @@ static boolean canreplicatescrollbar (hdlobject h) { -#pragma unused (h) +#pragma unused(h) + return (true); } /*canreplicatescrollbar*/ static boolean getscrollbareditrect (hdlobject h, Rect *r) { -#pragma unused (h, r) +#pragma unused(h, r) + return (false); /*can't be edited*/ } /*getscrollbareditrect*/ @@ -343,7 +349,8 @@ static boolean debugscrollbar (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) + setstringlength (errorstring, 0); return (true); Modified: Frontier/branches/Int64/Common/IOAToolkit/ioastatic.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioastatic.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IOAToolkit/ioastatic.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -105,7 +105,7 @@ static boolean debugstatic (hdlobject h, bigstring errorstring) { -#pragma unused (h) +#pragma unused(h) setstringlength (errorstring, 0); @@ -134,14 +134,14 @@ static boolean initstatic (tyobject *obj) { -#pragma unused (obj) +#pragma unused(obj) return (true); /*we do want to edit it*/ } /*initstatic*/ static boolean recalcstatic (hdlobject h, boolean flmajorrecalc) { -#pragma unused (flmajorrecalc) +#pragma unused(flmajorrecalc) return (IOArecalcobjectvalue (h)); } /*recalcstatic*/ Modified: Frontier/branches/Int64/Common/IowaRuntime/Headers/iowaruntime.h =================================================================== --- Frontier/branches/Int64/Common/IowaRuntime/Headers/iowaruntime.h 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IowaRuntime/Headers/iowaruntime.h 2006-04-07 18:04:09 UTC (rev 1219) @@ -112,7 +112,8 @@ boolean runCard (Handle, boolean, short, short, tycardeventcallback); -boolean runHostedCard (WindowPtr hostwindow, Handle hpackedcard, boolean flscriptedcard, tycardeventcallback lcallback); +// 2006-04-03 - kw --- renamed parameter +boolean runHostedCard (WindowPtr hostwindow, Handle hpackedcard, boolean flscriptedcard, tycardeventcallback pcallback); boolean setObjectValue (hdlcard, bigstring, Handle); Modified: Frontier/branches/Int64/Common/IowaRuntime/Source/iowacore.c =================================================================== --- Frontier/branches/Int64/Common/IowaRuntime/Source/iowacore.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IowaRuntime/Source/iowacore.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -908,13 +908,13 @@ if ((**h).objecthasframe) { - Rect lrobject; + Rect tempRect; // 2006-04-03 - kw ---renamed from robject - shadowwarning - lrobject = (**h).objectrect; + tempRect = (**h).objectrect; - if (!EmptyRect (&lrobject)) { /*user has changed its rect, it takes precedence*/ + if (!EmptyRect (&tempRect)) { /*user has changed its rect, it takes precedence*/ - rgroup = lrobject; + rgroup = tempRect; goto exit; } Modified: Frontier/branches/Int64/Common/IowaRuntime/Source/iowaruntime.c =================================================================== --- Frontier/branches/Int64/Common/IowaRuntime/Source/iowaruntime.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IowaRuntime/Source/iowaruntime.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -305,9 +305,7 @@ WindowPtr w; hdlcard hc; boolean beginendupdate; - Rect windBounds; // kw - 2006-02-02 --- osx refactoring - CGrafPtr thePort; - + if (hw == nil) // 7.3.97 dmb: can happen when multiple cards are started quickly return; @@ -316,18 +314,31 @@ beginendupdate = (**hw).ownwindow; /* || (**hc).macevent.what != updateEvt;*/ assert ((**hc).drawwindow == w); - - thePort = getmacwindowport(w); - - pushmacport (thePort); // kw - 2006-02-02 --- osx refactoring - + //Code change by Timothy Paustian Monday, August 21, 2000 9:34:50 PM + //have to use the port can't cast a window in OS X + { + CGrafPtr thePort; + #if TARGET_API_MAC_CARBON == 1 + thePort = GetWindowPort(w); + #else + thePort = (CGrafPtr)w; + #endif + pushmacport (thePort); + } if ((**hc).fullupdate) { - // kw - 2006-02-02 --- osx refactoring + //Code change by Timothy Paustian Friday, May 5, 2000 10:49:31 PM + //Changed to Opaque call for Carbon + //This may actually be useless in Carbon + #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 + CGrafPtr thePort; + Rect windBounds; + thePort = GetWindowPort(w); + GetPortBounds(thePort, &windBounds); + InvalWindowRect (w, &windBounds); + #else + InvalRect (&(*w).portRect); + #endif - windBounds = getwindowportrect(w); - - invalmacwindowrect(w, windBounds); - (**hc).fullupdate = false; } @@ -337,10 +348,10 @@ //Changed to Opaque call for Carbon #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 { - CGrafPtr lthePort; + CGrafPtr thePort; RgnHandle visRgn = NewRgn(); - lthePort = GetWindowPort(w); - visRgn = GetPortVisibleRegion(lthePort, visRgn); + thePort = GetWindowPort(w); + visRgn = GetPortVisibleRegion(thePort, visRgn); GetRegionBounds(visRgn, &(**hc).updaterect); DisposeRgn(visRgn); } @@ -360,9 +371,9 @@ //to the screen. Use QDFlushPortBuffer to do this. #if TARGET_API_MAC_CARBON == 1 { - CGrafPtr lthePort; - lthePort = GetWindowPort(w); - QDFlushPortBuffer(lthePort, nil); + CGrafPtr thePort; + thePort = GetWindowPort(w); + QDFlushPortBuffer(thePort, nil); } #endif iowadata = oldiowadata; @@ -457,18 +468,14 @@ nomad = (**nomad).nextinthread; } /*while*/ - + if (nearestnomad == nil) /*wrap around to the first guy*/ - { *hnext = lowestnomad; - } else - { *hnext = nearestnomad; - } -} /*getnexttextobject*/ + } /*getnexttextobject*/ + - static void getprevtextobject (hdlobject h, hdlobject *hnext) { hdlcard hc = iowadata; @@ -563,15 +570,21 @@ boolean recalcCardWindow (WindowPtr w, boolean flmajorrecalc) { - CGrafPtr thePort; - if (w == nil) return (false); - thePort = getmacwindowport(w); - + //Code change by Timothy Paustian Monday, August 21, 2000 9:34:50 PM + //have to use the port can't cast a window in OS X + { + CGrafPtr thePort; + #if TARGET_API_MAC_CARBON == 1 + thePort = GetWindowPort(w); + #else + thePort = (CGrafPtr)w; + #endif pushmacport (thePort); - + } + runtimedata = getwindowdata (w); /*set up global for runmode routines*/ iowadata = getwindowcardrecord (w); /*set up global for card routines*/ @@ -600,12 +613,10 @@ static void filterevent (EventRecord *ev) { + // 2006-04-03 - kw --- renamed callback -> lCallback + tycardeventcallback lCallback = (**runtimedata).callback; - CGrafPtr thePort; - - tycardeventcallback lcallback = (**runtimedata).callback; - - if (lcallback == nil) + if (lCallback == nil) return; if ((*ev).what == nullEvent) /*DW 8/22/93*/ @@ -618,55 +629,64 @@ clearbytes (&x, longsizeof (x)); x.what = iowaSetHandleEvent; - + x.message = (long) iowadata; - - (*lcallback) (&x); + + (*lCallback) (&x); } - - thePort = getmacwindowport((**iowadata).drawwindow); - + + //Code change by Timothy Paustian Monday, August 21, 2000 9:34:50 PM + //have to use the port can't cast a window in OS X + { + CGrafPtr thePort; + #if TARGET_API_MAC_CARBON == 1 + thePort = GetWindowPort((**iowadata).drawwindow); + #else + thePort = (CGrafPtr)(**iowadata).drawwindow; + #endif pushmacport (thePort); - - (*lcallback) (ev); - + } + + (*lCallback) (ev); + popmacport (); } /*filterevent*/ - - + + static void sendinitmessage (void) { tycardeventcallback lcallback = (**runtimedata).callback; EventRecord ev; - + if (lcallback == nil) return; - + ev.what = iowaInitEvent; - + ev.message = (long) iowadata; - + (*lcallback) (&ev); } /*sendinitmessage*/ - - + + static boolean sendbuttonhitmessage (hdlobject h) { /* return true if the buttonhit has been fully processed */ - tycardeventcallback lcallback = (**runtimedata).callback; + // 2006-04-03 - kw --- renamed callback -> lCallback + tycardeventcallback lCallback = (**runtimedata).callback; EventRecord ev; - if (lcallback == nil) + if (lCallback == nil) return (true); ev.what = iowaButtonHitEvent; ev.message = (long) h; - (*lcallback) (&ev); + (*lCallback) (&ev); if (ev.what == iowaRunScriptEvent) /*pass the buttonhit thru, run the script*/ return (false); @@ -686,17 +706,18 @@ giving him a chance to save data from the card. */ - tycardeventcallback lcallback = (**runtimedata).callback; + // 2006-04-03 - kw --- renamed callback -> lCallback + tycardeventcallback lCallback = (**runtimedata).callback; EventRecord ev; - if (lcallback == nil) + if (lCallback == nil) return (true); ev.what = iowaCloseEvent; ev.message = (long) iowadata; - (*lcallback) (&ev); + (*lCallback) (&ev); return (ev.what != iowaCancelEvent); } /*sendclosemessage*/ @@ -707,50 +728,40 @@ /* the user just clicked on this object in run mode. */ - - /*click on a clone is the same as clicking on the object*/ - derefclone (&h); - + + derefclone (&h); /*click on a clone is the same as clicking on the object*/ + if (sameasbuttontype ((**h).objecttype)) { - + if (sendbuttonhitmessage (h)) { - - /*protect against a closed window*/ - if (iowadata != nil) + + if (iowadata != nil) /*protect against a closed window*/ schedulerecalc (h, 0); - + return; } } - - if ( callclick( - listhead, - h, - mousestatus.localpt, - keyboardstatus.flshiftkey, - mousestatus.fldoubleclick)) - { + + if (callclick (listhead, h, mousestatus.localpt, keyboardstatus.flshiftkey, mousestatus.fldoubleclick)) { + if (iowadata == nil) /*protect against closed window*/ return; - - /*1/25/93 DW: very rarely you need to disable the quick recalc*/ - if (!flquickrecalc) { - + + if (!flquickrecalc) { /*1/25/93 DW: very rarely you need to disable the quick recalc*/ + flquickrecalc = true; /*must be reset for every call*/ - + return; } - + /*1/24/93 DW: streamlined for quick response to click and in recalc*/ - - /*avoid lag in display during massive recalcs*/ - runmodeupdate (); + + runmodeupdate (); /*avoid lag in display during massive recalcs*/ - /*make this card's table global*/ - frontSetRuntimeCard (true, false); - + frontSetRuntimeCard (true, false); /*make this card's table global*/ + (**iowadata).recalcobject = h; - + visitobjects ((**iowadata).objectlist, &minorrecalcvisit); /*recalc now, avoid lag*/ runmodeupdate (); /*avoid lag in display, agents might need to run now*/ @@ -834,16 +845,14 @@ (**hc).trackerobject = h; - /*display button in its hot state*/ - hotobject (true); + hotobject (true); /*display button in its hot state*/ waitfornexttick (); waitfornexttick (); waitfornexttick (); + + hotobject (false); /*display button in its un-hot state*/ - /*display button in its un-hot state*/ - hotobject (false); - (**hc).tracking = false; - + objectclick ((**iowadata).objectlist, h); return (false); /*stop searching*/ @@ -882,14 +891,16 @@ return (true); } - */ - if (ch == '.') - keyboardstatus.chkb = ch = chescape; - else -#endif + */ + if (ch == '.') + keyboardstatus.chkb = ch = chescape; + else + + #endif + return (false); /*we pass on all other cmd-keystrokes*/ } - + if (ch == chescape) { /*escape always kills the card*/ visitobjects ((**hc).objectlist, &mapkeyvisit); /*dmb 1.0b20*/ @@ -905,20 +916,17 @@ if (ch == chtab) { movetextboxcursor (keyboardstatus.flshiftkey); - + return (true); } - - if ((ch == chreturn) || (ch == chenter)) - { - if ( !keyboardstatus.floptionkey - || activetextobject == nil) /*dmb 1.0b20*/ - { + + if ((ch == chreturn) || (ch == chenter)) { + + if (!keyboardstatus.floptionkey || activetextobject == nil) /*dmb 1.0b20*/ if (!visitobjects ((**hc).objectlist, &returnkeyvisit)) return (true); } - } - + if (activetextobject == nil) { /*3/18/93 DW -- map keystroke to button*/ visitobjects ((**hc).objectlist, &mapkeyvisit); @@ -1021,9 +1029,7 @@ static void runmodecontentclick (WindowPtr w, Point pt) { - - CGrafPtr thePort; - + hdlobject listhead, x; if (w != FrontWindow ()) { @@ -1033,11 +1039,17 @@ return; } + //Code change by Timothy Paustian Wednesday, August 23, 2000 9:20:43 PM + // + { + #if TARGET_API_MAC_CARBON + CGrafPtr thePort = GetWindowPort(w); + #else + GrafPtr thePort = (GrafPtr)w; + #endif - thePort = getmacwindowport(w); - SetPort (thePort); - + } mousestatus.localpt = pt; globaltolocalpoint (w, &mousestatus.localpt); @@ -1144,30 +1156,45 @@ hdlcard hc = iowadata; WindowPtr w = (**runtimedata).macwindow; Rect portRect; - CGrafPtr thePort; - + if ((**hc).needsupdate && ((**hc).runmode)) { - - /*consume it*/ - (**hc).needsupdate = false; - thePort = getmacwindowport(w); - + (**hc).needsupdate = false; /*consume it*/ + + //Code change by Timothy Paustian Monday, August 21, 2000 9:34:50 PM + //have to use the port can't cast a window in OS X + { + CGrafPtr thePort; + #if TARGET_API_MAC_CARBON == 1 + thePort = GetWindowPort(w); + #else + thePort = (CGrafPtr)w; + #endif pushmacport (thePort); + } - portRect = getwindowportrect(w); + //Code change by Timothy Paustian Friday, May 5, 2000 10:55:27 PM + //Changed to Opaque call for Carbon + #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 + { + CGrafPtr thePort = GetWindowPort(w); + GetPortBounds(thePort, &portRect); + } + #else + portRect = w->portRect; + #endif pushclip (portRect); iowapreupdate (); /*actually inval everything that's been logically inval'd*/ - + runmodeupdate (); popclip (); popmacport (); - } -} /*runmodecheckupdate*/ + } + } /*runmodecheckupdate*/ static boolean alwaysidlevisit (hdlobject h) { @@ -1207,10 +1234,8 @@ boolean closeCardWindow (WindowPtr w) { - - CGrafPtr thePort; + Boolean ownwindow; - if (!isCardWindow (w)) return (false); @@ -1224,15 +1249,22 @@ ownwindow = (**runtimedata).ownwindow; -#ifdef iowaRuntimeInApp /*12/5/93 DW -- baling wire*/ - iowadata = getwindowcardrecord (w); -#endif - - thePort = getmacwindowport(w); - - /*8/27/94 DW -- on quit, if one modeless card is open, the port isn't properly set*/ + #ifdef iowaRuntimeInApp /*12/5/93 DW -- baling wire*/ + iowadata = getwindowcardrecord (w); + #endif + + //Code change by Timothy Paustian Monday, August 21, 2000 9:34:50 PM + //have to use the port can't cast a window in OS X + { + CGrafPtr thePort; + #if TARGET_API_MAC_CARBON == 1 + thePort = GetWindowPort(w); + #else + thePort = (CGrafPtr)w; + #endif pushmacport (thePort); - + } /*8/27/94 DW -- on quit, if one modeless card is open, the port isn't properly set*/ + clearactivetextobject (); popmacport (); @@ -1421,15 +1453,14 @@ pendrawline (r.right, r.bottom); /*draw bottom of box*/ -#if TARGET_API_MAC_CARBON == 1 - { + #if TARGET_API_MAC_CARBON == 1 + + { Rect rwindow; Rect rbackground; //short depth; - - // kw - 2006-02-02 --- this needs polish! - CGrafPtr thePort = getmacwindowport(w); - + CGrafPtr thePort = GetWindowPort (w); + GetPortBounds (thePort, &rwindow); //depth = maxdepth (&rwindow); @@ -1465,11 +1496,11 @@ poppen (); } - -#endif + + + #endif } /*frame3sides*/ - WindowPtr newCardWindow (Point pt, boolean notscriptedcard, Handle hpackedcard) { /* @@ -1482,8 +1513,7 @@ WindowPtr w = nil; hdlruntimerecord hw; hdlcard hc; - CGrafPtr thePort; - + iowadata = nil; if (!newclearhandle (longsizeof (tyruntimerecord), (Handle *) &runtimedata)) @@ -1509,9 +1539,8 @@ (**hc).updatecallback = &runmodeupdate; - /*DW 10/17/93: transition from default window resources, to letting the card specify*/ - { - + /*DW 10/17/93: transition from default window resources, to letting the card specify*/ { + short resnum = (**hc).idwindow; /*first try, use the resnum specified by card editor*/ if (systemhascolor ()) @@ -1521,42 +1550,51 @@ if (w == nil) goto error; + + #if TARGET_API_MAC_CARBON == 1 /*Theme background on OS X*/ + + if (!cardContainsEditTextObject (hc)) + + SetThemeWindowBackground (w, kThemeBrushModelessDialogBackgroundActive, false); -#if TARGET_API_MAC_CARBON == 1 /*Theme background on OS X*/ + else { + + SetPort (GetWindowPort (w)); - if (!cardContainsEditTextObject (hc)) - { - SetThemeWindowBackground (w, kThemeBrushModelessDialogBackgroundActive, false); + frameedittextrect (edittextrect, w); + } /*else*/ + + #endif } - else - { - SetPort (GetWindowPort (w)); - - frameedittextrect (edittextrect, w); - } /*else*/ -#endif - } SizeWindow (w, (**hc).rightborder, (**hc).bottomborder, false); ShowWindow (w); + //Code change by Timothy Paustian Wednesday, August 23, 2000 9:20:56 PM + // + { + #if TARGET_API_MAC_CARBON + CGrafPtr thePort = GetWindowPort(w); + #else + GrafPtr thePort = (GrafPtr)w; + #endif - thePort = getmacwindowport(w); - SetPort (thePort); - + } + if ((pt.h != 0) && (pt.v != 0)) MoveWindow (w, pt.h, pt.v, false); else { //Code change by Timothy Paustian Monday, June 26, 2000 3:15:51 PM -#if TARGET_API_MAC_CARBON == 1 + // + #if TARGET_API_MAC_CARBON == 1 BitMap screenBits; GetQDGlobalsScreenBits(&screenBits); centerwindow(w, screenBits.bounds); -#else + #else centerwindow (w, quickdrawglobal (screenBits).bounds); -#endif + #endif } (**hw).macwindow = w; @@ -1788,9 +1826,16 @@ releasetemphandles (); /*dispose of any temps created by the previous event*/ - thePort = getmacwindowport(w); - + //Code change by Timothy Paustian Monday, August 21, 2000 9:34:50 PM + //have to use the port can't cast a window in OS X + { + #if TARGET_API_MAC_CARBON == 1 + thePort = GetWindowPort(w); + #else + thePort = (CGrafPtr)w; + #endif pushmacport (thePort); + } cardcheckinit (); @@ -2252,14 +2297,8 @@ } /*passthruevent*/ -boolean -runModalCard ( - Handle hpackedcard, - boolean flscriptedcard, - short top, - short pLeft, - tycardeventcallback pCallback) -{ +boolean runModalCard (Handle hpackedcard, boolean flscriptedcard, short top, short pLeft, tycardeventcallback pCallback) { + // 2006-04-03 - kw --- renamed params left -pLeft, callback -> pCallback /* dmb 1.0b24: changed flcallback logic. we no longer call back on activate and update events that we just handled @@ -2271,31 +2310,30 @@ WindowPtr modalwindow; Point winpos; boolean flreturn; - CGrafPtr thePort; - + GetPort (&oldport); installRuntimeEventHandlers (); - + winpos.v = top; - + winpos.h = pLeft; - + modalwindow = newCardWindow (winpos, !flscriptedcard, hpackedcard); - + flreturn = true; if (modalwindow == nil) { flreturn = false; - + goto exit; } - + (**runtimedata).callback = pCallback; - + (**runtimedata).modeless = false; - + if (flscriptedcard) { if (!frontStartCard (nil)) { @@ -2304,12 +2342,19 @@ goto exit; } + } + //Code change by Timothy Paustian Wednesday, August 23, 2000 9:21:06 PM + // + { + #if TARGET_API_MAC_CARBON + CGrafPtr thePort = GetWindowPort(modalwindow); + #else + GrafPtr thePort = (GrafPtr)modalwindow; + #endif + + SetPort (thePort); } - - thePort = getmacwindowport(modalwindow); - - SetPort (thePort); - + sendinitmessage (); cardcheckinit (); /*1.0b23 dmb: init field before showing the card. more responsive*/ @@ -2352,24 +2397,30 @@ } } */ - + if ((flcallback) && (pCallback != nil)) { hdlcard loldiowadata = iowadata; hdlruntimerecord loldruntimedata = runtimedata; - + (*pCallback) (&ev); - + iowadata = loldiowadata; - + runtimedata = loldruntimedata; - - thePort = getmacwindowport(modalwindow); - + //Code change by Timothy Paustian Wednesday, August 23, 2000 9:21:26 PM + // + { + #if TARGET_API_MAC_CARBON + CGrafPtr thePort = GetWindowPort(modalwindow); + #else + GrafPtr thePort = (GrafPtr)modalwindow; + #endif + SetPort (thePort); - - } - + } + } + if (flexitcardloop) break; @@ -2380,16 +2431,16 @@ break; } /*while*/ -exit: + exit: + + flexitcardloop = false; /*we consume it, modal cards can be nested*/ - flexitcardloop = false; /*we consume it, modal cards can be nested*/ - - /*restore saved globals*/ - { + /*restore saved globals*/ { + iowadata = oldiowadata; - + runtimedata = oldruntimedata; - + SetPort (oldport); } @@ -2401,9 +2452,15 @@ hdlcard oldiowadata = iowadata; hdlruntimerecord oldruntimedata = runtimedata; - boolean flreturn = false; + //Code change by Timothy Paustian Monday, June 26, 2000 3:16:19 PM + // + #if TARGET_API_MAC_CARBON == 1 + CGrafPtr oldport = GetQDGlobalsThePort(); + #else + GrafPtr oldport = quickdrawglobal (thePort); + #endif + boolean flreturn = false; WindowPtr w; - CGrafPtr oldport = getport(); if ((*ev).what == nullEvent) { @@ -2449,12 +2506,16 @@ hdlcard oldiowadata = iowadata; hdlruntimerecord oldruntimedata = runtimedata; - Point winpos; + //Code change by Timothy Paustian Monday, June 26, 2000 3:15:15 PM + // + #if TARGET_API_MAC_CARBON == 1 + CGrafPtr oldport = GetQDGlobalsThePort(); + #else + GrafPtr oldport = quickdrawglobal (thePort); + #endif + Point winpos; WindowPtr modelesswindow; boolean flreturn; - CGrafPtr - oldport = getmacqdglobaltheport(), - thePort; installRuntimeEventHandlers (); @@ -2487,9 +2548,17 @@ } } - thePort = getmacwindowport(modelesswindow); - + //Code change by Timothy Paustian Wednesday, August 23, 2000 9:21:06 PM + // + { + #if TARGET_API_MAC_CARBON + CGrafPtr thePort = GetWindowPort(modelesswindow); + #else + GrafPtr thePort = (GrafPtr)modelesswindow; + #endif + SetPort (thePort); + } sendinitmessage (); @@ -2497,52 +2566,41 @@ ShowWindow (modelesswindow); -exit: + exit: - /*restore saved globals*/ - { + /*restore saved globals*/ { + iowadata = oldiowadata; - + runtimedata = oldruntimedata; - + SetPort (oldport); - } + } + return (flreturn); } /*runModelessCard*/ + - -boolean -runCard ( - Handle hpackedcard, - boolean flscriptedcard, - short top, - short pLeft, - tycardeventcallback pCallback) -{ - +boolean runCard (Handle hpackedcard, boolean flscriptedcard, short top, short pleft, tycardeventcallback pcallback) { + boolean fl; - + if (cardIsModal (hpackedcard)) - fl = runModalCard (hpackedcard, flscriptedcard, top, pLeft, pCallback); + fl = runModalCard (hpackedcard, flscriptedcard, top, pleft, pcallback); else - fl = runModelessCard (hpackedcard, flscriptedcard, top, pLeft, pCallback); - + fl = runModelessCard (hpackedcard, flscriptedcard, top, pleft, pcallback); + return (fl); } /*runCard*/ #pragma global_optimizer off -static WindowPtr -moveIntoCardWindow ( - WindowPtr hostwindow, - boolean notscriptedcard, - Handle hpackedcard) -{ - +static WindowPtr moveIntoCardWindow (WindowPtr hostwindow, boolean notscriptedcard, Handle hpackedcard) { + /* use existing window to run the packed card. - + dmb 2.1.96: this could share plenty of code with newCardWindow */ @@ -2609,21 +2667,14 @@ #pragma global_optimizer reset -boolean -runHostedCard ( - WindowPtr hostwindow, - Handle hpackedcard, - boolean flscriptedcard, - tycardeventcallback pCallback) -{ +boolean runHostedCard (WindowPtr hostwindow, Handle hpackedcard, boolean flscriptedcard, tycardeventcallback pCallback) { hdlcard oldiowadata = iowadata; hdlruntimerecord oldruntimedata = runtimedata; GrafPtr oldport; WindowPtr modelesswindow; boolean flreturn; - CGrafPtr thePort; - + GetPort (&oldport); installRuntimeEventHandlers (); @@ -2645,21 +2696,28 @@ goto exit; } } + //Code change by Timothy Paustian Wednesday, August 23, 2000 9:21:06 PM + // + { + #if TARGET_API_MAC_CARBON + CGrafPtr thePort = GetWindowPort(modelesswindow); + #else + GrafPtr thePort = (GrafPtr)modelesswindow; + #endif - thePort = getmacwindowport(modelesswindow); - SetPort (thePort); + } sendinitmessage (); -exit: + exit: - /*restore saved globals*/ - { + /*restore saved globals*/ { + iowadata = oldiowadata; - + runtimedata = oldruntimedata; - + SetPort (oldport); } Modified: Frontier/branches/Int64/Common/IowaRuntime/Source/iowascript.c =================================================================== --- Frontier/branches/Int64/Common/IowaRuntime/Source/iowascript.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/IowaRuntime/Source/iowascript.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -388,7 +388,7 @@ #endif static boolean rungraphicalurl (Handle hscript, bigstring errorstring) { -#pragma unused (hscript) +#pragma unused(hscript) setstringlength (errorstring, 0); Modified: Frontier/branches/Int64/Common/PCRE/pcre.c =================================================================== --- Frontier/branches/Int64/Common/PCRE/pcre.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/PCRE/pcre.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -1715,22 +1715,31 @@ posix_class *= 3; for (i = 0; i < 3; i++) - { - BOOL isblank = strncmp((char *)ptr, "blank", 5) == 0; - int taboffset = posix_class_maps[posix_class + i]; - if (taboffset < 0) break; - if (local_negate) + { + BOOL lisblank = strncmp((char *)ptr, "blank", 5) == 0; + int taboffset = posix_class_maps[posix_class + i]; + + if (taboffset < 0) + break; + + if (local_negate) { - for (c = 0; c < 32; c++) class[c] |= ~cbits[c+taboffset]; - if (isblank) class[1] |= 0x3c; + for (c = 0; c < 32; c++) + class[c] |= ~cbits[c+taboffset]; + + if (lisblank) + class[1] |= 0x3c; } - else + else { - for (c = 0; c < 32; c++) class[c] |= cbits[c+taboffset]; - if (isblank) class[1] &= ~0x3c; + for (c = 0; c < 32; c++) + class[c] |= cbits[c+taboffset]; + + if (lisblank) + class[1] &= ~0x3c; } - } - + } + ptr = tempptr + 1; class_charcount = 10; /* Set > 1; assumes more than 1 per class */ continue; /* End of POSIX syntax handling */ Copied: Frontier/branches/Int64/Common/Paige/PaigeWinVC8CRT.lib (from rev 1216, Frontier/trunk/Common/Paige/PaigeWinVC8CRT.lib) =================================================================== (Binary files differ) Modified: Frontier/branches/Int64/Common/Paige/headers/PAIGE.H =================================================================== --- Frontier/branches/Int64/Common/Paige/headers/PAIGE.H 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/Paige/headers/PAIGE.H 2006-04-07 18:04:09 UTC (rev 1219) @@ -1961,7 +1961,9 @@ /* Async Lock/Unlock */ -extern PG_PASCAL (pg_boolean) pgSetLockID (pg_ref pg, long ID); +// 2006-04-04 - kw --- removed parameter names +//extern PG_PASCAL (pg_boolean) pgSetLockID (pg_ref pg, long ID); +extern PG_PASCAL (pg_boolean) pgSetLockID (pg_ref, long); extern PG_PASCAL (long) pgGetLockID (pg_ref pg); @@ -2115,7 +2117,11 @@ extern PG_PASCAL (pg_boolean) pgGetStyleSheet (pg_ref pg, const select_pair_ptr selection, short PG_FAR *style_id); extern PG_PASCAL (short) pgFindStyleSheet (pg_ref pg, const style_info_ptr compare_style, const style_info_ptr mask); -extern PG_PASCAL (short) pgGetIndStyleSheet (pg_ref pg, short index, style_info_ptr stylesheet); + +// 2006-04-04 - kw --- removed parameter names +// extern PG_PASCAL (short) pgGetIndStyleSheet (pg_ref pg, short index, style_info_ptr stylesheet); +extern PG_PASCAL (short) pgGetIndStyleSheet (pg_ref, short, style_info_ptr); + extern PG_PASCAL (short) pgNewParStyle (pg_ref pg, const par_info_ptr new_style); extern PG_PASCAL (void) pgRemoveParStyle (pg_ref pg, short style_id); extern PG_PASCAL (short) pgNumParStyles (pg_ref pg); @@ -2128,17 +2134,28 @@ extern PG_PASCAL (pg_boolean) pgGetParStyleSheet (pg_ref pg, const select_pair_ptr selection, short PG_FAR *style_id); extern PG_PASCAL (short) pgFindParStyleSheet (pg_ref pg, const par_info_ptr compare_style, const par_info_ptr mask); -extern PG_PASCAL (short) pgGetIndParStyleSheet (pg_ref pg, short index, par_info_ptr stylesheet); + +// 2006-04-04 - kw --- removed parameter names +// extern PG_PASCAL (short) pgGetIndParStyleSheet (pg_ref pg, short index, par_info_ptr stylesheet); +extern PG_PASCAL (short) pgGetIndParStyleSheet (pg_ref, short, par_info_ptr); + extern PG_PASCAL (long) pgNewNamedStyle (pg_ref pg, pg_c_string_ptr stylename, const style_info_ptr style, const font_info_ptr font, par_info_ptr par); extern PG_PASCAL (long) pgAddNamedStyle (pg_ref pg, pg_c_string_ptr stylename, const short style_id, const short par_id); extern PG_PASCAL (void) pgApplyNamedStyle (pg_ref pg, select_pair_ptr selection, pg_c_string_ptr stylename, short draw_mode); -extern PG_PASCAL (void) pgApplyNamedStyleIndex (pg_ref pg, select_pair_ptr selection, long index, short draw_mode); + +// 2006-04-04 - kw --- removed parameter names +// extern PG_PASCAL (void) pgApplyNamedStyleIndex (pg_ref pg, select_pair_ptr selection, long index, short draw_mode); +extern PG_PASCAL (void) pgApplyNamedStyleIndex (pg_ref, select_pair_ptr, long, short); + extern PG_PASCAL (long) pgNumNamedStyles (pg_ref pg); extern PG_PASCAL (long) pgGetNamedStyleIndex (pg_ref pg, pg_c_string_ptr stylename); -extern PG_PASCAL (void) pgGetNamedStyleInfo (pg_ref pg, long index, style_info_ptr style, - font_info_ptr font, par_info_ptr par); + +// 2006-04-04 - kw --- removed parameter names +// extern PG_PASCAL (void) pgGetNamedStyleInfo (pg_ref pg, long index, style_info_ptr style, font_info_ptr font, par_info_ptr par); +extern PG_PASCAL (void) pgGetNamedStyleInfo (pg_ref, long, style_info_ptr, font_info_ptr, par_info_ptr); + extern PG_PASCAL (pg_boolean) pgGetNamedStyle (pg_ref pg, long named_style_index, named_stylesheet_ptr named_style); extern PG_PASCAL (pg_boolean) pgGetAppliedNamedStyle (pg_ref pg, select_pair_ptr selection, pg_c_string_ptr stylename); extern PG_PASCAL (void) pgDeleteNamedStyle (pg_ref pg, long named_style_index); @@ -2341,7 +2358,11 @@ pg_short_t exclusion2, short draw_mode); extern PG_PASCAL (void) pgInsertExclusionShape (pg_ref pg, pg_short_t position, shape_ref exclude_shape, short draw_mode); -extern PG_PASCAL (void) pgAttachParExclusion (pg_ref pg, long position, pg_short_t index, short draw_mode); + +// 2006-04-04 - kw --- removed parameter names +// extern PG_PASCAL (void) pgAttachParExclusion (pg_ref pg, long position, pg_short_t index, short draw_mode); +extern PG_PASCAL (void) pgAttachParExclusion (pg_ref, long, pg_short_t, short); + extern PG_PASCAL (long) pgGetAttachedPar (pg_ref pg, pg_short_t exclusion); Modified: Frontier/branches/Int64/Common/UserLandIACToolkit/land.c =================================================================== --- Frontier/branches/Int64/Common/UserLandIACToolkit/land.c 2006-04-07 15:25:44 UTC (rev 1218) +++ Frontier/branches/Int64/Common/UserLandIACToolkit/land.c 2006-04-07 18:04:09 UTC (rev 1219) @@ -586,6 +586,7 @@ pascal boolean landefaultbreakembrace (EventRecord *ev) { +#pragma unused (ev) /* return true if the user is holding down the cmd, option and shift keys. Modified: Frontier/branches/Int64/Common/UserLandIACToolkit/landgetparam.c =================================================================== --- ... [truncated message content] |
