Index: index.html =================================================================== RCS file: /cvsroot/tix/tix/index.html,v retrieving revision 1.5 diff -u -p -u -p -r1.5 index.html --- index.html 9 Dec 2001 05:23:39 -0000 1.5 +++ index.html 18 May 2004 12:39:55 -0000 @@ -34,7 +34,7 @@ liabilities. You should use Tix only if you agree to all of its licensing terms.
-
Index: demos/tixwidgets.tcl
===================================================================
RCS file: /cvsroot/tix/tix/demos/tixwidgets.tcl,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 tixwidgets.tcl
--- demos/tixwidgets.tcl 28 Mar 2004 02:44:56 -0000 1.3
+++ demos/tixwidgets.tcl 18 May 2004 12:39:55 -0000
@@ -29,6 +29,7 @@
#
package require Tix
+tixAppContext tix
tk appname "TixDemo#[pid]"
Index: demos/widget
===================================================================
RCS file: /cvsroot/tix/tix/demos/widget,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 widget
--- demos/widget 28 Mar 2004 02:44:56 -0000 1.6
+++ demos/widget 18 May 2004 12:39:55 -0000
@@ -22,6 +22,7 @@ exec wish "$0" "$@"
# $Id: widget,v 1.6 2004/03/28 02:44:56 hobbs Exp $
package require Tix
+tixAppContext tix
eval destroy [winfo child .]
wm title . "Tix Widget Tour"
set tix_demo_running 1
Index: generic/tixGeometry.c
===================================================================
RCS file: /cvsroot/tix/tix/generic/tixGeometry.c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 tixGeometry.c
--- generic/tixGeometry.c 28 Mar 2004 02:44:56 -0000 1.3
+++ generic/tixGeometry.c 18 May 2004 12:39:55 -0000
@@ -331,7 +331,7 @@ TIX_DEFINE_CMD(Tix_FlushXCmd)
return TCL_ERROR;
}
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
+#if !defined(__WIN32__) && !defined(MAC_TCL) && !defined(MAC_OSX_TK) /* UNIX */
XFlush(Tk_Display(tkwin));
#endif
return TCL_OK;
Index: generic/tixInit.c
===================================================================
RCS file: /cvsroot/tix/tix/generic/tixInit.c,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 tixInit.c
--- generic/tixInit.c 9 Apr 2004 21:36:40 -0000 1.15
+++ generic/tixInit.c 18 May 2004 12:39:55 -0000
@@ -61,13 +61,13 @@ static Tix_TclCmd commands[] = {
{"tixGrid", Tix_GridCmd},
{"tixHandleOptions", Tix_HandleOptionsCmd},
{"tixHList", Tix_HListCmd},
-#ifndef __WIN32__
+#if !defined(__WIN32__) && !defined(MAC_OSX_TK)
{"tixInputOnly", Tix_InputOnlyCmd},
#endif
{"tixManageGeometry", Tix_ManageGeometryCmd},
{"tixMapWindow", Tix_MapWindowCmd},
{"tixMoveResizeWindow", Tix_MoveResizeWindowCmd},
-#ifndef __WIN32__
+#if !defined(__WIN32__) && !defined(MAC_OSX_TK)
{"tixMwm", Tix_MwmCmd},
#endif
{"tixNoteBookFrame", Tix_NoteBookFrameCmd},
@@ -270,7 +270,7 @@ Tix_Init(interp)
tixColumnUid = Tk_GetUid("column");
tixDisabledUid = Tk_GetUid("disabled");
-#ifndef __WIN32__
+#if !defined(__WIN32__) && !defined(MAC_OSX_TK)
/* This is for tixMwm command */
Tk_CreateGenericHandler(TixMwmProtocolHandler, NULL);
#endif
Index: generic/tixInputO.c
===================================================================
RCS file: /cvsroot/tix/tix/generic/tixInputO.c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 tixInputO.c
--- generic/tixInputO.c 28 Mar 2004 02:44:57 -0000 1.2
+++ generic/tixInputO.c 18 May 2004 12:39:56 -0000
@@ -18,6 +18,7 @@
#include
-
@@ -36,7 +36,7 @@
+
Important release notes about this version of Tix.
-
Tix Users's Guide. An introduction to Tix under Python or Tcl.
Index: unix/Makefile.in
===================================================================
RCS file: /cvsroot/tix/tix/unix/Makefile.in,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile.in
--- unix/Makefile.in 24 Jan 2002 09:10:51 -0000 1.10
+++ unix/Makefile.in 18 May 2004 12:39:56 -0000
@@ -36,7 +36,7 @@ mandir = @mandir@
INSTALL_ROOT =
# Path for the platform independent Tix scripting libraries:
-TIX_LIBRARY = $(prefix)/lib/tix$(VERSION)
+TIX_LIBRARY = $(libdir)/tix$(VERSION)
# Directory in which to install the program tixwish:
BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
@@ -159,7 +159,7 @@ TIX_SAM_BUNDLES = tixSamLib.h tixBitmap
# "install" around; better to use the install-sh script that comes
# with the distribution, which is slower but guaranteed to work.
-INSTALL = ./install-sh -c
+INSTALL = $(srcdir)/install-sh -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
Index: unix/configure.in
===================================================================
RCS file: /cvsroot/tix/tix/unix/configure.in,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 configure.in
--- unix/configure.in 24 Jan 2002 09:10:51 -0000 1.9
+++ unix/configure.in 18 May 2004 12:39:56 -0000
@@ -363,7 +363,7 @@ fi
AC_SUBST(TK_BUILD_LIB_SPEC)
AC_SUBST(TCL_BUILD_LIB_SPEC)
-TIX_BUILD_LIB_SPEC="-L${TIX_SRC_DIR}/unix -ltix${VERSION}${DBGX}"
+TIX_BUILD_LIB_SPEC="-L`pwd` -ltix${VERSION}${DBGX}"
AC_SUBST(TIX_BUILD_LIB_SPEC)
#--------------------------------------------------------------------
Index: unix/pkgIndex.tcl
===================================================================
RCS file: unix/pkgIndex.tcl
diff -N unix/pkgIndex.tcl
--- unix/pkgIndex.tcl 3 Nov 2000 02:12:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-#
-# $Id: pkgIndex.tcl,v 1.2 2000/11/03 02:12:41 idiscovery Exp $
-#
-# Tcl package index file, version 1.0
-
-package ifneeded Tix 8.1.8.0 [list load "[file join [file dirname $dir] libtix8.1.8.0.so]" Tix]
-
-package ifneeded Tix 8.1.8.1 [list load "[file join [file dirname $dir] libtix8.1.8.1.so]" Tix]
-
-package ifneeded Tix 8.1.8.2 [list load "[file join [file dirname $dir] libtix8.1.8.2.so]" Tix]
-
-package ifneeded Tix 8.1.8.3 [list load "[file join [file dirname $dir] libtix8.1.8.3.so]" Tix]
-
Index: unix/tixUnixDraw.c
===================================================================
RCS file: /cvsroot/tix/tix/unix/tixUnixDraw.c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 tixUnixDraw.c
--- unix/tixUnixDraw.c 28 Mar 2004 02:44:57 -0000 1.5
+++ unix/tixUnixDraw.c 18 May 2004 12:39:56 -0000
@@ -195,10 +195,23 @@ TixpStartSubRegionDraw(display, drawable
subRegPtr->rect.y = (short)y;
subRegPtr->rect.width = (short)width;
subRegPtr->rect.height = (short)height;
+#ifndef MAC_OSX_TK
XSetClipRectangles(display, gc, origX, origY, &subRegPtr->rect,
1, Unsorted);
+#else
+ subRegPtr->pixmap = Tk_GetPixmap(display, drawable, width, height,
+ 32);
+
+ if (subRegPtr->pixmap != None) {
+ XCopyArea(display, drawable, subRegPtr->pixmap, gc, x, y,
+ width, height, 0, 0);
+ }
+#endif
} else {
subRegPtr->rectUsed = 0;
+#ifdef MAC_OSX_TK
+ subRegPtr->pixmap = None;
+#endif
}
}
@@ -208,11 +221,13 @@ TixpSubRegSetClip(display, subRegPtr, gc
TixpSubRegion * subRegPtr;
GC gc;
{
+#ifndef MAC_OSX_TK
if (subRegPtr->rectUsed) {
XSetClipRectangles(display, gc, subRegPtr->origX, subRegPtr->origY,
&subRegPtr->rect, 1, Unsorted);
}
+#endif
}
void
@@ -221,6 +236,7 @@ TixpSubRegUnsetClip(display, subRegPtr,
TixpSubRegion * subRegPtr;
GC gc;
{
+#ifndef MAC_OSX_TK
XRectangle rect;
if (subRegPtr->rectUsed) {
@@ -230,6 +246,7 @@ TixpSubRegUnsetClip(display, subRegPtr,
rect.height = 20000;
XSetClipRectangles(display, gc, 0, 0, &rect, 1, Unsorted);
}
+#endif
}
/*
@@ -247,7 +264,17 @@ TixpEndSubRegionDraw(display, drawable,
GC gc;
TixpSubRegion * subRegPtr;
{
+#ifndef MAC_OSX_TK
TixpSubRegUnsetClip(display, subRegPtr, gc);
+#else
+ if (subRegPtr->pixmap != None) {
+ XCopyArea(display, subRegPtr->pixmap, drawable, gc, 0, 0,
+ subRegPtr->rect.width, subRegPtr->rect.height,
+ subRegPtr->rect.x, subRegPtr->rect.y);
+ Tk_FreePixmap(display, subRegPtr->pixmap);
+ subRegPtr->pixmap = None;
+ }
+#endif
}
/*
@@ -288,8 +315,17 @@ TixpSubRegDisplayText(display, drawable,
int underline; /* Index of character to underline, or < 0
* for no underlining. */
{
+#ifdef MAC_OSX_TK
+ if (subRegPtr->pixmap != None) {
+ TixDisplayText(display, subRegPtr->pixmap, font, string,
+ numChars, x - subRegPtr->x, y - subRegPtr->y,
+ length, justify, underline, gc);
+ } else
+#endif
+ {
TixDisplayText(display, drawable, font, string,
numChars, x, y, length, justify, underline, gc);
+ }
}
/*----------------------------------------------------------------------
@@ -309,8 +345,16 @@ TixpSubRegFillRectangle(display, drawabl
* upper left corner of display area. */
int width, height; /* Size of the rectangle. */
{
+#ifdef MAC_OSX_TK
+ if (subRegPtr->pixmap != None) {
+ XFillRectangle(display, subRegPtr->pixmap, gc,
+ x - subRegPtr->x, y - subRegPtr->y, width, height);
+ } else
+#endif
+ {
XFillRectangle(display, drawable, gc, x, y,
(unsigned) width, (unsigned) height);
+ }
}
/*----------------------------------------------------------------------
@@ -332,6 +376,15 @@ TixpSubRegDrawImage(subRegPtr, image, im
int drawableX;
int drawableY;
{
+#ifdef MAC_OSX_TK
+ if (subRegPtr->pixmap != None) {
+ drawableX -= subRegPtr->x;
+ drawableY -= subRegPtr->y;
+ Tk_RedrawImage(image, imageX, imageY, width, height, subRegPtr->pixmap,
+ drawableX, drawableY);
+ } else
+#endif
+ {
if (subRegPtr->rectUsed) {
/*
* We need to do the clipping by hand because Tk_RedrawImage()
@@ -359,6 +412,7 @@ TixpSubRegDrawImage(subRegPtr, image, im
Tk_RedrawImage(image, imageX, imageY, width, height, drawable,
drawableX, drawableY);
+ }
}
void
@@ -374,8 +428,20 @@ TixpSubRegDrawBitmap(display, drawable,
int dest_x, dest_y;
unsigned long plane;
{
+#ifdef MAC_OSX_TK
+ XSetClipOrigin(display, gc, dest_x, dest_y);
+ if (subRegPtr->pixmap != None) {
+ XCopyPlane(display, bitmap, subRegPtr->pixmap, gc, src_x, src_y,
+ width, height, dest_x - subRegPtr->x, dest_y - subRegPtr->y,
+ plane);
+ } else {
+#endif
XCopyPlane(display, bitmap, drawable, gc, src_x, src_y,
(unsigned) width, (unsigned) height, dest_x, dest_y, plane);
+#ifdef MAC_OSX_TK
+ }
+ XSetClipOrigin(display, gc, 0, 0);
+#endif
}
/*
@@ -405,5 +471,14 @@ TixpSubRegDrawAnchorLines(display, drawa
int w; /* width of anchor rect */
int h; /* height of anchor rect */
{
+#ifdef MAC_OSX_TK
+ if (subRegPtr->pixmap != None) {
+ x -= subRegPtr->x;
+ y -= subRegPtr->y;
+ TixpDrawAnchorLines(display, subRegPtr->pixmap, gc, x, y, w, h);
+ } else
+#endif
+ {
TixpDrawAnchorLines(display, drawable, gc, x, y, w, h);
+ }
}
Index: unix/tixUnixMwm.c
===================================================================
RCS file: /cvsroot/tix/tix/unix/tixUnixMwm.c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 tixUnixMwm.c
--- unix/tixUnixMwm.c 28 Mar 2004 02:44:57 -0000 1.1
+++ unix/tixUnixMwm.c 19 May 2004 01:34:12 -0000
@@ -17,6 +17,7 @@
#include