Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source icon.c,1.4,1.4.6.1,pre_int64_branch kb.c,1.4,1.4.6.1,pre_int64_branch langdll.c,1.6,1.6.4.1,pre_int64_branch langpack.c,1.4.6.1,1.4.6.2,pre_int64_branch langvalue.c,1.8.2.4,1.8.2.5,pre_int64_branch menu.c,1.6,1.6.2.1,pre_int64_branch oplist.c,1.7.4.2,1.7.4.3,pre_int64_branch scripts.c,1.4.6.1,1.4.6.2,pre_int64_branch serialnumber.c,1.3,1.3.6.1,pre_int64_branch shellverbs.c,1.6,1.6.2.1,pre_int64_branch
|
From: Karsten W. <kar...@us...> - 2006-03-22 09:11:34
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16359/Common/source Modified Files: Tag: pre_int64_branch icon.c kb.c langdll.c langpack.c langvalue.c menu.c oplist.c scripts.c serialnumber.c shellverbs.c Log Message: update before switch Index: langpack.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpack.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 *** langpack.c 10 Mar 2006 22:26:57 -0000 1.4.6.1 --- langpack.c 22 Mar 2006 09:11:28 -0000 1.4.6.2 *************** *** 42,45 **** --- 42,46 ---- #include "tablestructure.h" + extern boolean getwinparam (hdltreenode, short, hdlwindowinfo *); // shellwindowverbs.c Index: oplist.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oplist.c,v retrieving revision 1.7.4.2 retrieving revision 1.7.4.3 diff -C2 -d -r1.7.4.2 -r1.7.4.3 *** oplist.c 19 Mar 2006 10:51:05 -0000 1.7.4.2 --- oplist.c 22 Mar 2006 09:11:28 -0000 1.7.4.3 *************** *** 56,70 **** #ifdef MACVERSION ! #define unconditionallongswap(x) ((((x) >> 24) & 0x000000ff) | (((x) & 0x00ff0000) >> 8) | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) ! #define unconditionalshortswap(x) ((((x) >> 8) & 0x00ff) | (((x) << 8) & 0xff00)) ! #define unconditionallyswaplong(x) do {(x) = unconditionallongswap(x);} while (0) ! #define unconditionallyswapshort(x) do {(x) = unconditionalshortswap(x);} while (0) #endif #ifdef WIN95VERSION ! #define unconditionallongswap(x) dolongswap(x) [...1207 lines suppressed...] nomad = (**ho).hsummit; ! while (true) ! { nextnomad = (**nomad).headlinkdown; ! opgetheadstring (nomad, bskey); ! if (!(*visit) ((**nomad).hrefcon, bskey, refcon)) return (false); ! if (nextnomad == nomad) break; ! nomad = nextnomad; ! } /*while*/ return (true); ! } /*opvisitlist*/ Index: langdll.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langdll.c,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** langdll.c 24 Jan 2005 03:02:37 -0000 1.6 --- langdll.c 22 Mar 2006 09:11:28 -0000 1.6.4.1 *************** *** 353,357 **** grabthreadglobals (); ! if (((value->valuetype == odb_recordvaluetype) || (value->valuetype == odb_listvaluetype)) && (value->data.listvalue != NULL)) { *cnt = opcountlistitems ((hdllistrecord) value->data.listvalue); --- 353,360 ---- grabthreadglobals (); ! if ( ( (value->valuetype == odb_recordvaluetype) ! || (value->valuetype == odb_listvaluetype)) ! && (value->data.listvalue != NULL)) ! { *cnt = opcountlistitems ((hdllistrecord) value->data.listvalue); Index: scripts.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scripts.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 *** scripts.c 2 Feb 2006 18:39:59 -0000 1.4.6.1 --- scripts.c 22 Mar 2006 09:11:28 -0000 1.4.6.2 *************** *** 1445,1449 **** static pascal OSErr handlerecordedtext (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { ! #pragma unused(refcon) /* 2.1b3 dmb: ignore extra syntax/lines needed for text-based recording --- 1445,1449 ---- static pascal OSErr handlerecordedtext (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { ! #pragma unused(refcon, reply) /* 2.1b3 dmb: ignore extra syntax/lines needed for text-based recording *************** *** 1676,1680 **** static pascal OSErr handlestoprecording (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { ! #pragma unused(refcon, event) /* 2.1b5 dmb: special event handler for QuicKeys recording panel --- 1676,1680 ---- static pascal OSErr handlestoprecording (const AppleEvent *event, AppleEvent *reply, SInt32 refcon) { ! #pragma unused(refcon, event, reply) /* 2.1b5 dmb: special event handler for QuicKeys recording panel Index: kb.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/kb.c,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** kb.c 11 Jan 2005 22:48:05 -0000 1.4 --- kb.c 22 Mar 2006 09:11:28 -0000 1.4.6.1 *************** *** 99,116 **** */ ! #ifdef MACVERSION ! KeyMap keys; ! ! GetKeys (keys); ! ! return (BitTst (&keys, keycode) != 0); ! #endif ! #ifdef WIN95VERSION ! if (flasync) ! return ((GetAsyncKeyState (keycode) & 0x8000) == 0x8000); ! else ! return ((GetKeyState (keycode) & 0x8000) == 0x8000); ! #endif ! } /*keydown*/ --- 99,117 ---- */ ! #ifdef MACVERSION ! #pragma unused(flasync) ! KeyMap keys; ! ! GetKeys (keys); ! ! return (BitTst (&keys, keycode) != 0); ! #endif ! #ifdef WIN95VERSION ! if (flasync) ! return ((GetAsyncKeyState (keycode) & 0x8000) == 0x8000); ! else ! return ((GetKeyState (keycode) & 0x8000) == 0x8000); ! #endif ! } /*keydown*/ Index: icon.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/icon.c,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** icon.c 11 Jan 2005 22:48:05 -0000 1.4 --- icon.c 22 Mar 2006 09:11:28 -0000 1.4.6.1 *************** *** 669,690 **** #if TARGET_API_MAC_CARBON == 1 ! static void MyThemeButtonDrawCallback (const Rect *bounds, ThemeButtonKind kind, const ThemeButtonDrawInfo *info, ! UInt32 refcon, SInt16 depth, Boolean isColorDev) { ! ! /* ! 7.0b48 PBS: draw the arrow for a pushbutton. It will be centered. ! */ ! ! Rect rarrow; ! //ptrstring bsptr = (ptrstring) refcon; ! ! setrect (&rarrow, 0, 0, 9, 9); ! ! centerrect (&rarrow, *bounds); ! ! rarrow.left++; /*it appears to need it*/ ! ! DrawThemePopupArrow (&rarrow, kThemeArrowRight, kThemeArrow9pt, kThemeStateActive, NULL, NULL); ! } /*MyThemeButtonDrawCallback*/ #endif --- 669,697 ---- #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, refcon, depth, isColorDev) ! /* ! 7.0b48 PBS: draw the arrow for a pushbutton. It will be centered. ! */ ! ! Rect rarrow; ! //ptrstring bsptr = (ptrstring) refcon; ! ! setrect (&rarrow, 0, 0, 9, 9); ! ! centerrect (&rarrow, *bounds); ! ! rarrow.left++; /*it appears to need it*/ ! ! DrawThemePopupArrow (&rarrow, kThemeArrowRight, kThemeArrow9pt, kThemeStateActive, NULL, NULL); ! } /*MyThemeButtonDrawCallback*/ #endif Index: langvalue.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v retrieving revision 1.8.2.4 retrieving revision 1.8.2.5 diff -C2 -d -r1.8.2.4 -r1.8.2.5 *** langvalue.c 19 Mar 2006 10:51:04 -0000 1.8.2.4 --- langvalue.c 22 Mar 2006 09:11:28 -0000 1.8.2.5 *************** *** 2228,2232 **** return (false); ! x = LLONG_MAX; break; --- 2228,2232 ---- return (false); ! x = 0; //LLONG_MAX; break; *************** *** 2330,2334 **** } return(true); // have a happy compiler ! } /* coercetolong */ --- 2330,2334 ---- } return(true); // have a happy compiler ! } /* coercetolonglong */ Index: serialnumber.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/serialnumber.c,v retrieving revision 1.3 retrieving revision 1.3.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** serialnumber.c 11 Jan 2005 22:48:10 -0000 1.3 --- serialnumber.c 22 Mar 2006 09:11:28 -0000 1.3.6.1 *************** *** 36,39 **** --- 36,40 ---- boolean isvalidserialnumber (bigstring bsserialnumber) { + #pragma unused(bsserialnumber) /* Index: shellverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellverbs.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** shellverbs.c 1 Nov 2005 19:11:57 -0000 1.6 --- shellverbs.c 22 Mar 2006 09:11:28 -0000 1.6.2.1 *************** *** 65,68 **** --- 65,69 ---- #include "langregexp.h" + extern boolean getwinparam (hdltreenode, short, hdlwindowinfo *); // shellwindowverbs.c typedef enum tysearchtoken { /*search verbs*/ Index: menu.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menu.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** menu.c 20 Dec 2005 22:30:35 -0000 1.6 --- menu.c 22 Mar 2006 09:11:28 -0000 1.6.2.1 *************** *** 551,560 **** boolean inserthierarchicmenu (hdlmenu hmenu, short idmenu) { ! ! #ifdef MACVERSION ! InsertMenu (hmenu, insertsubmenu); ! return (true); ! #endif #if WIN95VERSION --- 551,560 ---- boolean inserthierarchicmenu (hdlmenu hmenu, short idmenu) { ! #ifdef MACVERSION ! #pragma unused(idmenu) ! InsertMenu (hmenu, insertsubmenu); ! return (true); ! #endif #if WIN95VERSION *************** *** 726,743 **** //Code change by Timothy Paustian Friday, June 9, 2000 9:44:07 PM //Changed to Modern calls for Enabling and Disabling menu items ! #ifdef MACVERSION ! if (fl) ! #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 ! EnableMenuItem (hmenu, 0); ! #else ! EnableItem (hmenu, 0); ! #endif ! else ! #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 ! DisableMenuItem (hmenu, 0); ! #else ! DisableItem (hmenu, 0); ! #endif ! #endif #if WIN95VERSION --- 726,744 ---- //Code change by Timothy Paustian Friday, June 9, 2000 9:44:07 PM //Changed to Modern calls for Enabling and Disabling menu items ! #ifdef MACVERSION ! #pragma unused(idmenu) ! if (fl) ! #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 ! EnableMenuItem (hmenu, 0); ! #else ! EnableItem (hmenu, 0); ! #endif ! else ! #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 ! DisableMenuItem (hmenu, 0); ! #else ! DisableItem (hmenu, 0); ! #endif ! #endif #if WIN95VERSION *************** *** 799,802 **** --- 800,804 ---- #ifdef MACVERSION + #pragma unused(idmenu) #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 return IsMenuItemEnabled(hmenu, 0); *************** *** 1480,1483 **** --- 1482,1486 ---- #ifdef MACVERSION + #pragma unused(idmenu) bigstring bsspace; *************** *** 1530,1533 **** --- 1533,1538 ---- #ifdef MACVERSION + #pragma unused(idmenu) + //Code change by Timothy Paustian Wednesday, June 28, 2000 4:27:19 PM //You can't do this in carbon. |
