diff options
| author | das <das> | 2002-10-09 11:56:25 (GMT) |
|---|---|---|
| committer | das <das> | 2002-10-09 11:56:25 (GMT) |
| commit | 4278227fc8a6be392dcdaeeb74167fd1197e50ed (patch) | |
| tree | 7a0531085231adfb4afeee1749324d002f0e35c2 /mac | |
| parent | 8cbbdb18b55a4c0123e7c195f078bfe52e27f2a4 (diff) | |
| download | tk-4278227fc8a6be392dcdaeeb74167fd1197e50ed.zip tk-4278227fc8a6be392dcdaeeb74167fd1197e50ed.tar.gz tk-4278227fc8a6be392dcdaeeb74167fd1197e50ed.tar.bz2 | |
* generic/tkInt.decls(tkIntXlib): added XQueryTree declaration for
mac & aqua, since it's now called from ParentXId via Tk_HandleEvent.
* generic/tkIntXlibDecls.h:
* generic/tkStubInit.c: regen.
* mac/tkMacXStubs.c: added XQueryTree stub
* mac/tkMacEmbed.c (TkpUseWindow): check that container window
has -container option set (sync with other platforms).
* mac/tkMacBitmap.c:
* mac/tkMacFont.c:
* mac/tkMacSend.c:
* mac/tkMacTest.c:
* mac/tkMacWm.c: CONSTification.
* mac/tkMacProjects.sea.hqx: added tkStyle.c and tkUndo.c to
tk library projects.
Diffstat (limited to 'mac')
| -rw-r--r-- | mac/tkMacBitmap.c | 4 | ||||
| -rw-r--r-- | mac/tkMacEmbed.c | 17 | ||||
| -rw-r--r-- | mac/tkMacFont.c | 11 | ||||
| -rw-r--r-- | mac/tkMacProjects.sea.hqx | 7469 | ||||
| -rw-r--r-- | mac/tkMacSend.c | 6 | ||||
| -rw-r--r-- | mac/tkMacTest.c | 6 | ||||
| -rw-r--r-- | mac/tkMacWm.c | 12 | ||||
| -rw-r--r-- | mac/tkMacXStubs.c | 15 |
8 files changed, 3766 insertions, 3774 deletions
diff --git a/mac/tkMacBitmap.c b/mac/tkMacBitmap.c index 918b190..7b59149 100644 --- a/mac/tkMacBitmap.c +++ b/mac/tkMacBitmap.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacBitmap.c,v 1.5 2002/08/31 06:12:28 das Exp $ + * RCS: @(#) $Id: tkMacBitmap.c,v 1.6 2002/10/09 11:56:36 das Exp $ */ #include "tkPort.h" @@ -97,7 +97,7 @@ TkpDefineNativeBitmaps() int new; Tcl_HashEntry *predefHashPtr; TkPredefBitmap *predefPtr; - char * name; + CONST char * name; BuiltInIcon *builtInPtr; NativeIcon *nativeIconPtr; Tcl_HashTable *tablePtr; diff --git a/mac/tkMacEmbed.c b/mac/tkMacEmbed.c index d370f32..06ceaa4 100644 --- a/mac/tkMacEmbed.c +++ b/mac/tkMacEmbed.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacEmbed.c,v 1.5 2002/08/05 04:30:40 dgp Exp $ + * RCS: @(#) $Id: tkMacEmbed.c,v 1.6 2002/10/09 11:56:39 das Exp $ */ #include "tkInt.h" @@ -236,6 +236,7 @@ TkpUseWindow( * for tkwin; must be an integer value. */ { TkWindow *winPtr = (TkWindow *) tkwin; + TkWindow *usePtr; MacDrawable *parent, *macWin; Container *containerPtr; XEvent event; @@ -259,6 +260,20 @@ TkpUseWindow( return TCL_ERROR; } + usePtr = (TkWindow *) Tk_IdToWindow(winPtr->display, (Window) result); + + if (usePtr == NULL) { + Tcl_AppendResult(interp, "Tk window does not correspond to id \"", + string, "\"", (char *) NULL); + return TCL_ERROR; + } else { + if (!(usePtr->flags & TK_CONTAINER)) { + Tcl_AppendResult(interp, "window \"", usePtr->pathName, + "\" doesn't have -container option set", (char *) NULL); + return TCL_ERROR; + } + } + parent = (MacDrawable *) result; /* diff --git a/mac/tkMacFont.c b/mac/tkMacFont.c index f58c76d..61159a8 100644 --- a/mac/tkMacFont.c +++ b/mac/tkMacFont.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacFont.c,v 1.7 2002/01/17 03:35:01 dgp Exp $ + * RCS: @(#) $Id: tkMacFont.c,v 1.8 2002/10/09 11:56:43 das Exp $ */ #include <Windows.h> @@ -241,7 +241,7 @@ static FontFamily * AllocFontFamily(CONST MacFont *fontPtr, int family); static SubFont * CanUseFallback(MacFont *fontPtr, CONST char *fallbackName, int ch); static SubFont * CanUseFallbackWithAliases(MacFont *fontPtr, - char *faceName, int ch, Tcl_DString *nameTriedPtr); + CONST char *faceName, int ch, Tcl_DString *nameTriedPtr); static SubFont * FindSubFontForChar(MacFont *fontPtr, int ch); static void FontMapInsert(SubFont *subFontPtr, int ch); static void FontMapLoadPage(SubFont *subFontPtr, int row); @@ -484,7 +484,8 @@ TkpGetFontFromAttributes( { short faceNum, style; int i, j; - char *faceName, *fallback; + CONST char *faceName; + char *fallback; char ***fallbacks; MacFont *fontPtr; @@ -1498,7 +1499,7 @@ FindSubFontForChar( int ch) /* The Unicode character to be displayed. */ { int i, j, k; - char *fallbackName; + CONST char *fallbackName; char **aliases; SubFont *subFontPtr; FontNameMap *mapPtr; @@ -1831,7 +1832,7 @@ static SubFont * CanUseFallbackWithAliases( MacFont *fontPtr, /* The font object that will own the new * screen font. */ - char *faceName, /* Desired face name for new screen font. */ + CONST char *faceName, /* Desired face name for new screen font. */ int ch, /* The Unicode character that the new * screen font must be able to display. */ Tcl_DString *nameTriedPtr) /* Records face names that have already diff --git a/mac/tkMacProjects.sea.hqx b/mac/tkMacProjects.sea.hqx index 209db47..a4dbd68 100644 --- a/mac/tkMacProjects.sea.hqx +++ b/mac/tkMacProjects.sea.hqx @@ -1,3755 +1,3718 @@ (This file must be converted with BinHex 4.0) -:%A4V6@&M8(*[DQ9MG(-ZFf9K!%&38%aKGA0d)3!!!55`!!'FbmEa8h4eCQC*G#! -SBbNa16Nh,6)`-$%J3@aKC'4TEL"6HA0dC@ec,#"*EQ-Z,#"SG(4`1Lm[Gj!$,Q& -XB@4ND@jcHA-ZBfpY,e0dG@CQ5A3[$3SD!!83!!%NX!#3!h)!!3#3!h*$LJfPT9* -PFf9bGQ9NTD8!TC!%!3!!1!"%Y[&1mlEa6e`!N!d)([`!N!21!#T5+!!")q)!!Ld -q)%*eD@aN!!#6j`"h!!-"K3)M!F$rN!3$([rirr$,4!!!J!#3"k@3"!%!!$8!4,3 -GFA1ieiZ4!*!$FJ!")jN!N!0b!!A&[!!!!5F!+P"#!!%LFJ!',6iJG'X!!&%D!(d -!%!(C!IS"`2q3"!)HrrMrm-Y!!!#!!*!(TC!%!3!!1J#!Y+(T3,G0'[)!N!21!!! -0p`#3!mi!#TmI!!#ULJ!!$()!N!32!&4VAde%48BZci!!!%#b68e3FN0A588"!2q -3"!#3#S"`!*!'3X(8V`#MIfe6h,C[6F[BU8PkVQmm&A9!cS#KIR"DLBeM9H,PPS9 -d$9l$pX31ecFM`r`D9A%EPU'2`AfrXQc3kZLVbRrdF`ZFFdJTQa6FP4TP[+DkdKd -$UL5rmEZA21frG`99bH&Rc3X-)&5'bmT3#bhE*GM,D2h8md6[acq`JM[fj)P2i,b -Y9q)BrZ)45'D(mZBINfb*PEL)kXC15Kp82)Z+R-6-jSbG'A-$6RfjrM#H1rHJCSe -1j(-'6DT5f06B4Vm$i0PlE02VVDF&!LJh3&Sd9X*IL,`M,S$%&3!R14*QPjmC2V+ -m2*P29-k0@f9H$S,11pmb9fIRC04*pH!2-@"KccLRSaH4,+4akTVqJI1S"PjAcPV -0bIaF`3)KVU!82phDS5TPm+A8Q%X60rCDlEV-FFe!(*@qJqT)kNSc&J%4HBC[cD5 -Vr)rTBlQE$ebD(mj&pSj0U,CN+EVk,Z6p@HH16KJ0hZi&!kjeL#6T#aPmcX`3Y+6 -58Z*[I5@`QYfrLE&m&qY9$hK4!)mj`hf0,d-)ie'bEXSLlc1Y)NRqF"TrMPUl%(r -AHkhjeZ'&EZ2dA3R[%c%3PGfjAUP0G2"i'@C$U*Ic[QXZK"JSp8bMk1[$JXNi0"" -cDX*5%bQI,D1dPb`Ck-D98a$T@*rK$(Q6(6EMa`3(m96#MAGDTF--MKp0'hVr19! -ZI!4-(ae#[H8MJDIAr'bKe'D#dmkNrJXr`(@EJ6MD6ZAHddVS`b*a"4#XXVSX9CD -Z(['rf0c9bH2VP%%Y*lQY'b(jMJl4Gc8"L9KLJK`,B5k`J&DPNE*DXaY#k!kbj@H -k66eAAkIG`@@JVC-Hc&Q&l'MKiT'R92,*G%Y&NfYrR*kD1$EJKBHZCS$S85YG',h -b8KS#'8+QilL&1XNF*b"9-jH'bfmMYfamFTc542UAX)!ST@!`3-bBS6blR80FNMV -#,LkDp(N'bDX9CKU@L0ZmNTUD#h'SfElJIEcBkF9c(QdZ@CQ9Fki,+@,AN!#XY+! -T14FHXHKa"N%#p@9,6Db2La"Dl@J,)'lA,'im%S@KYNR02k)"G!2[#JcSfbd8,"L -"h4[D$FRV&A"N%UT"l2j0i',-iB+EapaR&p#,l!@MI1d[E2XKK5@#P$(j,b+!RZI -Eej+'!d#+JZV@$`,GN!!@H1mS@-PU&[p9h61Q%VR$,HB)&hX9DShiq@%Cf`6@1+M -C*Cd#qKD-"*hiV[$plpikJ"2d4fH*f+V0VHPc-Y1`E)Z*!Tl8dlDkb62Se8dJLqp -"3V8A4&G%b'c*fQ&q"bU5m'4JFD14D,R5k8'k#e(`ZhX@JCb9pYXIRF$U9JdV5e6 -F))XC*rZIG5)i3eXlXLchH+-1(i-H66q*jim$@@(CF22+dK6UFkPVi0VfIUaaViR -J5MYYdr%d&4F`5cVU2lYm*)ZrjN'dA@1pUZF!L!XiZcqGI"JX&V1@AXlC[dLR3Na -Xf4N'!2[8q*X1qJM1hFBU6SYSPKbN%'ZN-KfC2m"hDBN05hH3!2FcQe+(SYX6[cf -l6PCTdeJVQQb84!Nl1"GE-Ym85"Q4KLUmhHSA@0L'%Di`p$f6,I[R`P#$3U3IZqj -KBcTe5f#b2$CUa4f0QSR$fN4*hC5D$3VXXRGe%RN`mA#A*lQ5K44I$H@*'cNMd8! -23F"$5J4D,SYqJB4*-YV'rpb$6Nh64@`i)RDE9Ieer59VU)$BA#%!SlFd"PFNY1( -ie[$kGB"V-!FD[02GAYbJQ*J6NA+m'48"U,IEEZ0T+P2F&NSh*B(-S6k9$m%iY(j -8LVTMMSFE$lc)9(LG5Z9Z%"C0mFL[d!m*19lF%54bIDf`deAZkL0#+,1[KSpBK9T -i*-kK0*NRe'LlTDE`34LeIdHT0IQ,LK"jY&dd1JDGR8QpPUp+2i3YXN8JdrKkG2P -UAde4N5p9"d`1FQ+q,X@qd,erqe33I3XSpr"N5)rRJ1M6AY%*fNc1p!Q`QGT)rc' -Hp6TrL%,F@4Paq3I2Ee6AK*mT+mCMG+@p98MR-U,M`raQIdp("*(8bJ0amqV,qF9 -[2&!adUa)d,V'2TqmBC&!e'8K3CP)+-i#YV3jCmTr8k&,[GakD'$KqI)E!"clSd) -",d)er(VYBT*)+fF'0[bq#R8e@)aGlprLGZQJ$C4XrfY!QmhCS2MF-0Bcl`-V$9H -p9$G6fA&0-"i*E%4m6'i+Fmp29N`K5#m4r!Xa1&TLA6PZR&UAcHkYFjk%2GiqJT[ -M+XBB[q*U)Ik*BY&(NM*5Kjbq@r)#[3+,ZZ+Z6iR6E,HSBQJZ&!1CXmeU3kY0T+2 -3#22B)#BPN!$QQ3V(JN#d[P-T!kke&*hLkm`54)*Vr$,&&PmcD1eI+AJb56*h$)@ -9L,dl)*2kHjfZb2P#T`B4c3HFDG+L"&`BQ-cQ@)'2)TG%Gj0JT"L)*#dJ4RXA64F -*m[,eIIrdDdT8IT6T4C+U!+e3IFGjU965@RZAbRU58C!