Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source command.c,1.2,1.3 miniwindow.c,1.2,1.3 cancoonpopup.c,1.2,1.3 cancoonwindow.c,1.2,1.3
|
From: Andre R. <and...@us...> - 2004-10-31 17:31:13
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6922 Modified Files: command.c miniwindow.c cancoonpopup.c cancoonwindow.c Log Message: Fixed GCC compiler warnings. Index: miniwindow.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/miniwindow.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** miniwindow.c 23 Oct 2004 22:37:40 -0000 1.2 --- miniwindow.c 31 Oct 2004 17:31:02 -0000 1.3 *************** *** 138,143 **** invalrect ((**minidata).popuprects [popupnumber]); ! } /*minisetpopupmessage*/ ! void minisetselect (short startsel, short endsel) { --- 138,143 ---- invalrect ((**minidata).popuprects [popupnumber]); ! } /%minisetpopupmessage%/ ! */ void minisetselect (short startsel, short endsel) { *************** *** 150,153 **** --- 150,155 ---- + #if 0 + static void minigetactivetextrect (Rect *r) { *************** *** 161,164 **** --- 163,168 ---- } /*minigetactivetextitem*/ + #endif + static boolean miniselectallandactivate (short newactiveitem) { *************** *** 183,187 **** ! static boolean mininextwindowvisit (WindowPtr w, WindowPtr *nextwindow) { if (*nextwindow == nil) { /*we passed our target*/ --- 187,193 ---- ! static boolean mininextwindowvisit (WindowPtr w, ptrvoid refcon) { ! ! WindowPtr *nextwindow = (WindowPtr *) refcon; if (*nextwindow == nil) { /*we passed our target*/ *************** *** 427,430 **** --- 433,438 ---- + #if 0 + static void minizoomtexttoicon (void) { *************** *** 462,465 **** --- 470,475 ---- } /*minizoomicontomsg*/ + #endif + static boolean miniiconhit (boolean flanimate) { *************** *** 684,688 **** */ - register hdlminirecord hm = minidata; register char chkb = keyboardstatus.chkb; --- 694,697 ---- *************** *** 853,857 **** #endif ! /***(**hm).flmassiveupdate = true; /*it don't get much more massive than this!*/ } /*miniresize*/ --- 862,866 ---- #endif ! //(**hm).flmassiveupdate = true; /*it don't get much more massive than this!*/ } /*miniresize*/ *************** *** 978,982 **** static void miniupdate (void) { - register hdlwindowinfo hw = miniwindowinfo; register hdlminirecord hm = minidata; --- 987,990 ---- *************** *** 1008,1012 **** ! static boolean minifindvisit (WindowPtr w, hdlwindowinfo *hinfo) { /* --- 1016,1020 ---- ! static boolean minifindvisit (WindowPtr w, ptrvoid refcon) { /* *************** *** 1017,1020 **** --- 1025,1030 ---- */ + hdlwindowinfo *hinfo = (hdlwindowinfo *) refcon; + miniwindow = w; *************** *** 1137,1142 **** static boolean miniadjustcursor (Point pt){ - register hdlminirecord hm = minidata; - if (minifindtextobject (pt) >= 0) { --- 1147,1150 ---- *************** *** 1213,1217 **** return (false); ! return (shellsetscrap (htext, textscraptype, disposehandle, nil)); } else --- 1221,1225 ---- return (false); ! return (shellsetscrap (htext, textscraptype, (shelldisposescrapcallback) disposehandle, nil)); } else *************** *** 1268,1274 **** */ - register hdloutlinerecord ho = outlinedata; - register hdlheadrecord hnode = (hdlheadrecord) globals; - if (!flundo) return (true); --- 1276,1279 ---- Index: cancoonpopup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cancoonpopup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cancoonpopup.c 23 Oct 2004 22:13:11 -0000 1.2 --- cancoonpopup.c 31 Oct 2004 17:31:02 -0000 1.3 *************** *** 54,60 **** ! static boolean ccagentpopupvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptragentpopupinfo info) { hdltreenode hcode; if (!langexternalvaltocode (val, &hcode)) /*not a scipt, or no code*/ --- 54,61 ---- ! static boolean ccagentpopupvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { hdltreenode hcode; + ptragentpopupinfo info = (ptragentpopupinfo) refcon; if (!langexternalvaltocode (val, &hcode)) /*not a scipt, or no code*/ *************** *** 95,99 **** ! static boolean ccagentselectvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptragentpopupinfo info) { /* --- 96,100 ---- ! static boolean ccagentselectvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 105,108 **** --- 106,110 ---- hdltreenode hcode; bigstring bs; + ptragentpopupinfo info = (ptragentpopupinfo) refcon; if (!langexternalvaltocode (val, &hcode)) /*not a scipt*/ *************** *** 115,119 **** /* ! if ((**hc).hprimaryagent == hcode) /*already selected -- toggle to off, no selection%/ (**hc).hprimaryagent = nil; else --- 117,121 ---- /* ! if ((**hc).hprimaryagent == hcode) /%already selected -- toggle to off, no selection%/ (**hc).hprimaryagent = nil; else Index: cancoonwindow.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cancoonwindow.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cancoonwindow.c 23 Oct 2004 22:13:37 -0000 1.2 --- cancoonwindow.c 31 Oct 2004 17:31:02 -0000 1.3 *************** *** 376,380 **** ! static boolean findrootvisit (WindowPtr w, WindowPtr *pw) { hdlwindowinfo hinfo; --- 376,380 ---- ! static boolean findrootvisit (WindowPtr w, ptrvoid refcon) { hdlwindowinfo hinfo; *************** *** 385,388 **** --- 385,390 ---- if (hf && ((**hf).refcon == (long) cancoonglobals)) { // got it + + WindowPtr *pw = (WindowPtr *) refcon; *pw = w; Index: command.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/command.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** command.c 23 Oct 2004 22:15:04 -0000 1.2 --- command.c 31 Oct 2004 17:31:02 -0000 1.3 *************** *** 179,183 **** register hdlprocessrecord hp = (hdlprocessrecord) hprocess; - register hdlhashtable ht = nil; tyvaluerecord val; bigstring bsresult; --- 179,182 ---- |
