diff options
| author | das <das> | 2003-03-18 13:47:51 (GMT) |
|---|---|---|
| committer | das <das> | 2003-03-18 13:47:51 (GMT) |
| commit | 6d2e686af813fdc90ed20c73f1326d12c1ffe6c1 (patch) | |
| tree | 6cc80dc64de0ee1159949f14575b233bf5761f6c /macosx/tkMacOSXXStubs.c | |
| parent | eca44d19d52e388aa19ca757cf2d64ee8c9db3e4 (diff) | |
| download | tk-6d2e686af813fdc90ed20c73f1326d12c1ffe6c1.zip tk-6d2e686af813fdc90ed20c73f1326d12c1ffe6c1.tar.gz tk-6d2e686af813fdc90ed20c73f1326d12c1ffe6c1.tar.bz2 | |
* macosx/Wish.pbproj/project.pbxproj:
* macosx/Makefile:
* macosx/README: added support for giving 'make' the location
of Tcl.framework and tclsh to build and link against.
* macosx/tkMacOSXXStubs.c: fixed crash in [winfo server].
Diffstat (limited to 'macosx/tkMacOSXXStubs.c')
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index a92fbcf..baadba5 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.2 2002/08/31 06:12:31 das Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.3 2003/03/18 13:47:52 das Exp $ */ #include "tkInt.h" @@ -116,6 +116,11 @@ TkpOpenDisplay( display->display_name = macScreenName; display->qlen = 0; display->fd = fd; + display->proto_major_version = 10; + Gestalt(gestaltQuickdrawVersion, (long*)&display->proto_minor_version); + display->proto_minor_version -= gestaltMacOSXQD; + display->vendor = "Apple"; + Gestalt(gestaltSystemVersion, (long*)&display->release); screen->root = ROOT_ID; screen->display = display; @@ -648,9 +653,9 @@ TkGetServerInfo( char buffer[8 + TCL_INTEGER_SPACE * 2]; char buffer2[TCL_INTEGER_SPACE]; - sprintf(buffer, "X%dR%d ", ProtocolVersion(Tk_Display(tkwin)), + sprintf(buffer, "QD%dR%x ", ProtocolVersion(Tk_Display(tkwin)), ProtocolRevision(Tk_Display(tkwin))); - sprintf(buffer2, " %d", VendorRelease(Tk_Display(tkwin))); + sprintf(buffer2, " %x", VendorRelease(Tk_Display(tkwin))); Tcl_AppendResult(interp, buffer, ServerVendor(Tk_Display(tkwin)), buffer2, (char *) NULL); } |