Merge trunk. Fix factor bug in TtkScrollable <Shift-Option-MouseWheel> binding

10 files changed, 54 insertions, 189 deletions

diff --git a/generic/tkPkgConfig.c b/generic/tkPkgConfig.c
index a3666d4..fe084bf 100644
--- a/generic/tkPkgConfig.c
+++ b/generic/tkPkgConfig.c
@@ -40,7 +40,7 @@
 
 
 #ifndef TCL_CFGVAL_ENCODING
-#define TCL_CFGVAL_ENCODING "ascii"
+#define TCL_CFGVAL_ENCODING "utf-8"
 #endif
 
 /*
@@ -84,7 +84,7 @@
 #  define CFG_PROFILED		"0"
 #endif
 
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
 #  define CFG_FONTSYSTEM	"gdi"
 #elif defined(MAC_OSX_TK)
 #  define CFG_FONTSYSTEM	"cocoa"
diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c
index b95bd9b..a6a5e35 100644
--- a/generic/tkTextBTree.c
+++ b/generic/tkTextBTree.c
@@ -4592,10 +4592,9 @@ static TkTextSegment *
 CharCleanupProc(
     TkTextSegment *segPtr,	/* Pointer to first of two adjacent segments
 				 * to join. */
-    TkTextLine *linePtr)	/* Line containing segments (not used). */
+    TCL_UNUSED(TkTextLine *))	/* Line containing segments (not used). */
 {
     TkTextSegment *segPtr2, *newPtr;
-    (void)linePtr;
 
     segPtr2 = segPtr->nextPtr;
     if ((segPtr2 == NULL) || (segPtr2->typePtr != &tkTextCharType)) {
@@ -4632,14 +4631,11 @@ CharCleanupProc(
 static int
 CharDeleteProc(
     TkTextSegment *segPtr,	/* Segment to delete. */
-    TkTextLine *linePtr,	/* Line containing segment. */
-    int treeGone)		/* Non-zero means the entire tree is being
+    TCL_UNUSED(TkTextLine *),	/* Line containing segment. */
+    TCL_UNUSED(int))		/* Non-zero means the entire tree is being
 				 * deleted, so everything must get cleaned
 				 * up. */
 {
-    (void)linePtr;
-    (void)treeGone;
-
     ckfree(segPtr);
     return 0;
 }
@@ -4664,10 +4660,8 @@ CharDeleteProc(
 static void
 CharCheckProc(
     TkTextSegment *segPtr,	/* Segment to check. */
-    TkTextLine *linePtr)	/* Line containing segment. */
+    TCL_UNUSED(TkTextLine *))	/* Line containing segment. */
 {
-    (void)linePtr;
-
     /*
      * Make sure that the segment contains the number of characters indicated
      * by its header, and that the last segment in a line ends in a newline.
diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c
index 9370b92..89acd75 100644
--- a/generic/tkTextImage.c
+++ b/generic/tkTextImage.c
@@ -290,8 +290,8 @@ TkTextImageCmd(
 		    (const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
 		    -1));
 	}
-	Tcl_SetObjResult(interp, resultObj);
-	return TCL_OK;
+	Tcl_WrongNumArgs(interp, 3, objv, NULL);
+	break;
     }
     default:
 	Tcl_Panic("unexpected switch fallthrough");
@@ -447,14 +447,12 @@ EmbImageConfigure(
 static int
 EmbImageDeleteProc(
     TkTextSegment *eiPtr,	/* Segment being deleted. */
-    TkTextLine *linePtr,	/* Line containing segment. */
-    int treeGone)		/* Non-zero means the entire tree is being
+    TCL_UNUSED(TkTextLine *),	/* Line containing segment. */
+    TCL_UNUSED(int))		/* Non-zero means the entire tree is being
 				 * deleted, so everything must get cleaned
 				 * up. */
 {
     Tcl_HashEntry *hPtr;
-    (void)linePtr;
-    (void)treeGone;
 
     if (eiPtr->body.ei.image != NULL) {
 	hPtr = Tcl_FindHashEntry(&eiPtr->body.ei.sharedTextPtr->imageTable,
@@ -531,17 +529,17 @@ EmbImageCleanupProc(
 static int
 EmbImageLayoutProc(
     TkText *textPtr,		/* Text widget being layed out. */
-    TkTextIndex *indexPtr,	/* Identifies first character in chunk. */
+    TCL_UNUSED(TkTextIndex *),	/* Identifies first character in chunk. */
     TkTextSegment *eiPtr,	/* Segment corresponding to indexPtr. */
     TkSizeT offset,			/* Offset within segPtr corresponding to
 				 * indexPtr (always 0). */
     int maxX,			/* Chunk must not occupy pixels at this
 				 * position or higher. */
-    TkSizeT maxChars,		/* Chunk must not include more than this many
+    TCL_UNUSED(TkSizeT),	/* Chunk must not include more than this many
 				 * characters. */
     int noCharsYet,		/* Non-zero means no characters have been
 				 * assigned to this line yet. */
-    TkWrapMode wrapMode,	/* Wrap mode to use for line:
+    TCL_UNUSED(TkWrapMode),	/* Wrap mode to use for line:
 				 * TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_NONE, or
 				 * TEXT_WRAPMODE_WORD. */
     TkTextDispChunk *chunkPtr)
@@ -550,9 +548,6 @@ EmbImageLayoutProc(
 				 * set by the caller. */
 {
     int width, height;
-    (void)indexPtr;
-    (void)maxChars;
-    (void)wrapMode;
 
     if (offset != 0) {
 	Tcl_Panic("Non-zero offset in EmbImageLayoutProc");
@@ -622,10 +617,8 @@ EmbImageLayoutProc(
 static void
 EmbImageCheckProc(
     TkTextSegment *eiPtr,	/* Segment to check. */
-    TkTextLine *linePtr)	/* Line containing segment. */
+    TCL_UNUSED(TkTextLine *))	/* Line containing segment. */
 {
-    (void)linePtr;
-
     if (eiPtr->nextPtr == NULL) {
 	Tcl_Panic("EmbImageCheckProc: embedded image is last segment in line");
     }
@@ -665,16 +658,14 @@ EmbImageDisplayProc(
 				 * (x-position is in the chunk itself). */
     int lineHeight,		/* Total height of line. */
     int baseline,		/* Offset of baseline from y. */
-    Display *display,		/* Display to use for drawing. */
+    TCL_UNUSED(Display *),	/* Display to use for drawing. */
     Drawable dst,		/* Pixmap or window in which to draw */
-    int screenY)		/* Y-coordinate in text window that
+    TCL_UNUSED(int))	/* Y-coordinate in text window that
 				 * corresponds to y. */
 {
     TkTextSegment *eiPtr = (TkTextSegment *)chunkPtr->clientData;
     int lineX, imageX, imageY, width, height;
     Tk_Image image;
-    (void)display;
-    (void)screenY;
 
     image = eiPtr->body.ei.image;
     if (image == NULL) {
@@ -720,9 +711,9 @@ EmbImageDisplayProc(
 
 static void
 EmbImageBboxProc(
-    TkText *textPtr,
+    TCL_UNUSED(TkText *),
     TkTextDispChunk *chunkPtr,	/* Chunk containing desired char. */
-    int index,			/* Index of desired character within the
+    TCL_UNUSED(int),			/* Index of desired character within the
 				 * chunk. */
     int y,			/* Topmost pixel in area allocated for this
 				 * line. */
@@ -738,8 +729,6 @@ EmbImageBboxProc(
 {
     TkTextSegment *eiPtr = (TkTextSegment *)chunkPtr->clientData;
     Tk_Image image;
-    (void)textPtr;
-    (void)index;
 
     image = eiPtr->body.ei.image;
     if (image != NULL) {
@@ -830,21 +819,18 @@ TkTextImageIndex(
 static void
 EmbImageProc(
     ClientData clientData,	/* Pointer to widget record. */
-    int x, int y,		/* Upper left pixel (within image) that must
+    TCL_UNUSED(int),		/* Upper left pixel (within image) that must
 				 * be redisplayed. */
-    int width, int height,	/* Dimensions of area to redisplay (may be
+    TCL_UNUSED(int),
+    TCL_UNUSED(int),	/* Dimensions of area to redisplay (may be
 				 * <= 0). */
-    int imgWidth, int imgHeight)/* New dimensions of image. */
+    TCL_UNUSED(int),
+    TCL_UNUSED(int),/* New dimensions of image. */
+    TCL_UNUSED(int))
 
 {
     TkTextSegment *eiPtr = (TkTextSegment *)clientData;
     TkTextIndex index;
-    (void)x;
-    (void)y;
-    (void)width;
-    (void)height;
-    (void)imgWidth;
-    (void)imgHeight;
 
     index.tree = eiPtr->body.ei.sharedTextPtr->tree;
     index.linePtr = eiPtr->body.ei.linePtr;
diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c
index 87816f4..d9bf299 100644
--- a/generic/tkTextIndex.c
+++ b/generic/tkTextIndex.c
@@ -62,7 +62,7 @@ static void		UpdateStringOfTextIndex(Tcl_Obj *objPtr);
 #define GET_INDEXEPOCH(objPtr) \
 	(PTR2INT((objPtr)->internalRep.twoPtrValue.ptr2))
 #define SET_TEXTINDEX(objPtr, indexPtr) \
-	((objPtr)->internalRep.twoPtrValue.ptr1 = (void *) (indexPtr))
+	((objPtr)->internalRep.twoPtrValue.ptr1 = (void *)(indexPtr))
 #define SET_INDEXEPOCH(objPtr, epoch) \
 	((objPtr)->internalRep.twoPtrValue.ptr2 = (void *) (size_t) (epoch))
 
diff --git a/generic/tkTextMark.c b/generic/tkTextMark.c
index fe5a892..141e2e5 100644
--- a/generic/tkTextMark.c
+++ b/generic/tkTextMark.c
@@ -501,16 +501,12 @@ TkTextMarkNameToIndex(
 
 static int
 MarkDeleteProc(
-    TkTextSegment *segPtr,	/* Segment being deleted. */
-    TkTextLine *linePtr,	/* Line containing segment. */
-    int treeGone)		/* Non-zero means the entire tree is being
+    TCL_UNUSED(TkTextSegment *),	/* Segment being deleted. */
+    TCL_UNUSED(TkTextLine *),	/* Line containing segment. */
+    TCL_UNUSED(int))		/* Non-zero means the entire tree is being
 				 * deleted, so everything must get cleaned
 				 * up. */
 {
-    (void)segPtr;
-    (void)linePtr;
-    (void)treeGone;
-
     return 1;
 }
 
@@ -562,29 +558,22 @@ MarkCleanupProc(
 static int
 MarkLayoutProc(
     TkText *textPtr,		/* Text widget being layed out. */
-    TkTextIndex *indexPtr,	/* Identifies first character in chunk. */
+    TCL_UNUSED(TkTextIndex *),	/* Identifies first character in chunk. */
     TkTextSegment *segPtr,	/* Segment corresponding to indexPtr. */
-    TkSizeT offset,			/* Offset within segPtr corresponding to
+    TCL_UNUSED(TkSizeT),		/* Offset within segPtr corresponding to
 				 * indexPtr (always 0). */
-    int maxX,			/* Chunk must not occupy pixels at this
+    TCL_UNUSED(int),			/* Chunk must not occupy pixels at this
 				 * position or higher. */
-    TkSizeT maxChars,		/* Chunk must not include more than this many
+    TCL_UNUSED(TkSizeT),		/* Chunk must not include more than this many
 				 * characters. */
-    int noCharsYet,		/* Non-zero means no characters have been
+    TCL_UNUSED(int),		/* Non-zero means no characters have been
 				 * assigned to this line yet. */
-    TkWrapMode wrapMode,	/* Not used. */
+    TCL_UNUSED(TkWrapMode),	/* Not used. */
     TkTextDispChunk *chunkPtr)
 				/* Structure to fill in with information about
 				 * this chunk. The x field has already been
 				 * set by the caller. */
 {
-    (void)indexPtr;
-    (void)offset;
-    (void)maxX;
-    (void)maxChars;
-    (void)noCharsYet;
-    (void)wrapMode;
-
     if (segPtr != textPtr->insertMarkPtr) {
 	return -1;
     }
@@ -628,15 +617,15 @@ MarkLayoutProc(
 void
 TkTextInsertDisplayProc(
     TkText *textPtr,		/* The current text widget. */
-    TkTextDispChunk *chunkPtr,	/* Chunk that is to be drawn. */
+    TCL_UNUSED(TkTextDispChunk *),	/* Chunk that is to be drawn. */
     int x,			/* X-position in dst at which to draw this
 				 * chunk (may differ from the x-position in
 				 * the chunk because of scrolling). */
     int y,			/* Y-position at which to draw this chunk in
 				 * dst (x-position is in the chunk itself). */
     int height,			/* Total height of line. */
-    int baseline,		/* Offset of baseline from y. */
-    Display *display,		/* Display to use for drawing. */
+    TCL_UNUSED(int),		/* Offset of baseline from y. */
+    TCL_UNUSED(Display *),		/* Display to use for drawing. */
     Drawable dst,		/* Pixmap or window in which to draw chunk. */
     int screenY)		/* Y-coordinate in text window that
 				 * corresponds to y. */
@@ -650,9 +639,6 @@ TkTextInsertDisplayProc(
     int halfWidth = textPtr->insertWidth/2;
     int rightSideWidth;
     int ix = 0, iy = 0, iw = 0, ih = 0, charWidth = 0;
-    (void)chunkPtr;
-    (void)baseline;
-    (void)display;
 
     if (textPtr->insertCursorType) {
 	TkTextMarkSegToIndex(textPtr, textPtr->insertMarkPtr, &index);
@@ -735,12 +721,9 @@ TkTextInsertDisplayProc(
 
 static void
 InsertUndisplayProc(
-    TkText *textPtr,		/* Overall information about text widget. */
-    TkTextDispChunk *chunkPtr)	/* Chunk that is about to be freed. */
+    TCL_UNUSED(TkText *),		/* Overall information about text widget. */
+    TCL_UNUSED(TkTextDispChunk *))	/* Chunk that is about to be freed. */
 {
-    (void)textPtr;
-    (void)chunkPtr;
-
     return;
 }
 
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index b9f64e0..8622b3e 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -576,12 +576,11 @@ EmbWinStructureProc(
 static void
 EmbWinRequestProc(
     ClientData clientData,	/* Pointer to record for window item. */
-    Tk_Window tkwin)		/* Window that changed its desired size. */
+    TCL_UNUSED(Tk_Window))		/* Window that changed its desired size. */
 {
     TkTextEmbWindowClient *client = (TkTextEmbWindowClient *)clientData;
     TkTextSegment *ewPtr = client->parent;
     TkTextIndex index;
-    (void)tkwin;
 
     index.tree = ewPtr->body.ew.sharedTextPtr->tree;
     index.linePtr = ewPtr->body.ew.linePtr;
@@ -739,15 +738,13 @@ TkTextWinFreeClient(
 static int
 EmbWinDeleteProc(
     TkTextSegment *ewPtr,	/* Segment being deleted. */
-    TkTextLine *linePtr,	/* Line containing segment. */
-    int treeGone)		/* Non-zero means the entire tree is being
+    TCL_UNUSED(TkTextLine *),	/* Line containing segment. */
+    TCL_UNUSED(int))		/* Non-zero means the entire tree is being
 				 * deleted, so everything must get cleaned
 				 * up. */
 {
     TkTextEmbWindowClient *client;
     client = ewPtr->body.ew.clients;
-    (void)linePtr;
-    (void)treeGone;
 
     while (client != NULL) {
 	TkTextEmbWindowClient *next = client->next;
@@ -820,17 +817,17 @@ EmbWinCleanupProc(
 static int
 EmbWinLayoutProc(
     TkText *textPtr,		/* Text widget being layed out. */
-    TkTextIndex *indexPtr,	/* Identifies first character in chunk. */
+    TCL_UNUSED(TkTextIndex *),	/* Identifies first character in chunk. */
     TkTextSegment *ewPtr,	/* Segment corresponding to indexPtr. */
     TkSizeT offset,			/* Offset within segPtr corresponding to
 				 * indexPtr (always 0). */
     int maxX,			/* Chunk must not occupy pixels at this
 				 * position or higher. */
-    TkSizeT maxChars,		/* Chunk must not include more than this many
+    TCL_UNUSED(TkSizeT),	/* Chunk must not include more than this many
 				 * characters. */
     int noCharsYet,		/* Non-zero means no characters have been
 				 * assigned to this line yet. */
-    TkWrapMode wrapMode,	/* Wrap mode to use for line:
+    TCL_UNUSED(TkWrapMode),	/* Wrap mode to use for line:
 				 * TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_NONE, or
 				 * TEXT_WRAPMODE_WORD. */
     TkTextDispChunk *chunkPtr)
@@ -840,9 +837,6 @@ EmbWinLayoutProc(
 {
     int width, height;
     TkTextEmbWindowClient *client;
-    (void)indexPtr;
-    (void)maxChars;
-    (void)wrapMode;
 
     if (offset != 0) {
 	Tcl_Panic("Non-zero offset in EmbWinLayoutProc");
@@ -1055,10 +1049,8 @@ EmbWinLayoutProc(
 static void
 EmbWinCheckProc(
     TkTextSegment *ewPtr,	/* Segment to check. */
-    TkTextLine *linePtr)	/* Line containing segment. */
+    TCL_UNUSED(TkTextLine *))	/* Line containing segment. */
 {
-    (void)linePtr;
-
     if (ewPtr->nextPtr == NULL) {
 	Tcl_Panic("EmbWinCheckProc: embedded window is last segment in line");
     }
@@ -1092,13 +1084,13 @@ TkTextEmbWinDisplayProc(
     int x,			/* X-position in dst at which to draw this
 				 * chunk (differs from the x-position in the
 				 * chunk because of scrolling). */
-    int y,			/* Top of rectangular bounding box for line:
+    TCL_UNUSED(int),	/* Top of rectangular bounding box for line:
 				 * tells where to draw this chunk in dst
 				 * (x-position is in the chunk itself). */
     int lineHeight,		/* Total height of line. */
     int baseline,		/* Offset of baseline from y. */
-    Display *display,		/* Display to use for drawing (unused).  */
-    Drawable dst,		/* Pixmap or window in which to draw
+    TCL_UNUSED(Display *),	/* Display to use for drawing (unused).  */
+    TCL_UNUSED(Drawable),	/* Pixmap or window in which to draw
 				 * (unused).  */
     int screenY)		/* Y-coordinate in text window that
 				 * corresponds to y. */
@@ -1107,9 +1099,6 @@ TkTextEmbWinDisplayProc(
     Tk_Window tkwin;
     TkTextSegment *ewPtr = (TkTextSegment *)chunkPtr->clientData;
     TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
-    (void)y;
-    (void)display;
-    (void)dst;
 
     if (client == NULL) {
 	return;
@@ -1236,7 +1225,7 @@ static void
 EmbWinBboxProc(
     TkText *textPtr,		/* Information about text widget. */
     TkTextDispChunk *chunkPtr,	/* Chunk containing desired char. */
-    int index,			/* Index of desired character within the
+    TCL_UNUSED(int),			/* Index of desired character within the
 				 * chunk. */
     int y,			/* Topmost pixel in area allocated for this
 				 * line. */
@@ -1253,7 +1242,6 @@ EmbWinBboxProc(
     Tk_Window tkwin;
     TkTextSegment *ewPtr = (TkTextSegment *)chunkPtr->clientData;
     TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
-    (void)index;
 
     if (client == NULL) {
 	tkwin = NULL;
diff --git a/library/tk.tcl b/library/tk.tcl
index bf00e6f..7f18f8a 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -535,7 +535,7 @@ proc ::tk::CancelRepeat {} {
 
 ## ::tk::MouseWheel $w $dir $amount $factor $units
 
-proc ::tk::MouseWheel {w dir amount factor {units units}} {
+proc ::tk::MouseWheel {w dir amount {factor -120.0} {units units}} {
     $w ${dir}view scroll [expr {$amount/$factor}] $units
 }
 
diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
index de7565c..181c208 100644
--- a/library/ttk/utils.tcl
+++ b/library/ttk/utils.tcl
@@ -298,12 +298,12 @@ proc ttk::bindMouseWheel {bindtag callback} {
 #
 
 bind TtkScrollable <MouseWheel> \
-	{ tk::MouseWheel %W y %D -120.0 }
+	{ tk::MouseWheel %W y %D }
 bind TtkScrollable <Option-MouseWheel> \
 	{ tk::MouseWheel %W y %D -12.0 }
 bind TtkScrollable <Shift-MouseWheel> \
-	{ tk::MouseWheel %W x %D -120.0 }
+	{ tk::MouseWheel %W x %D }
 bind TtkScrollable <Shift-Option-MouseWheel> \
-	{ tk::MouseWheel %W x %D -120.0 }
+	{ tk::MouseWheel %W x %D -12.0 }
 
 #*EOF*
diff --git a/unix/configure b/unix/configure
index c535fe8..13c36a9 100755
--- a/unix/configure
+++ b/unix/configure
@@ -663,9 +663,6 @@ TK_MAJOR_VERSION
 TK_VERSION
 TK_DEMO_DIR
 DEMO_DIR
-UNIX_LIBNOTIFY_OBJS
-LIBNOTIFY_LIBS
-LIBNOTIFY_CFLAGS
 UNIX_FONT_OBJS
 XFT_LIBS
 XFT_CFLAGS
@@ -781,7 +778,6 @@ enable_symbols
 enable_aqua
 with_x
 enable_xft
-enable_libnotify
 enable_xss
 enable_framework
 '
@@ -1425,7 +1421,6 @@ Optional Features:
   --enable-symbols        build with debugging symbols (default: off)
   --enable-aqua=yes|no    use Aqua windowingsystem on Mac OS X (default: no)
   --enable-xft            use freetype/fontconfig/xft (default: on)
-  --enable-libnotify      use libnotify (default: on)
   --enable-xss            use XScreenSaver for activity timer (default: on)
   --enable-framework      package shared libraries in MacOSX frameworks
                           (default: off)
@@ -7822,50 +7817,6 @@ $as_echo "#define HAVE_XFT 1" >>confdefs.h
 fi
 
 #--------------------------------------------------------------------
-#	Check for libnotify.
-#--------------------------------------------------------------------
-
-if test $tk_aqua = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libnotify" >&5
-$as_echo_n "checking whether to use libnotify... " >&6; }
-    # Check whether --enable-libnotify was given.
-if test "${enable_libnotify+set}" = set; then :
-  enableval=$enable_libnotify; enable_libnotify=$enableval
-else
-  enable_libfnotify="default"
-fi
-
-    LIBNOTIFY_CFLAGS=""
-    LIBNOTIFY_LIBS=""
-    if test "$enable_libnotify" = "no" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libnotify" >&5
-$as_echo "$enable_libnotify" >&6; }
-    else
-	found_libnotify="yes"
-		LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no"
-	LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no"
-	if test "$found_libnotify" = "no" ; then
-	    found_libnotify=yes
-	    LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no"
-	    LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no"
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_libnotify" >&5
-$as_echo "$found_libnotify" >&6; }
-    fi
-    if test $enable_libnotify = "yes" ; then
-	UNIX_LIBNOTIFY_OBJS=tkUnixSysNotify.o
-
-$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h
-
-    else
-	UNIX_LIBNOTIFY_OBJS=""
-    fi
-
-
-
-fi
-
-#--------------------------------------------------------------------
 # XXX Do this last.
 # It might modify XLIBSW which could affect other tests.
 #
diff --git a/unix/configure.ac b/unix/configure.ac
index 286e7e5..b765f13 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -520,43 +520,6 @@ if test $tk_aqua = no; then
 fi
 
 #--------------------------------------------------------------------
-#	Check for libnotify.
-#--------------------------------------------------------------------
-
-if test $tk_aqua = no; then
-    AC_MSG_CHECKING([whether to use libnotify])
-    AC_ARG_ENABLE(libnotify,
-	AC_HELP_STRING([--enable-libnotify],
-	    [use libnotify (default: on)]),
-	[enable_libnotify=$enableval], [enable_libfnotify="default"])
-    LIBNOTIFY_CFLAGS=""
-    LIBNOTIFY_LIBS=""
-    if test "$enable_libnotify" = "no" ; then
-	AC_MSG_RESULT([$enable_libnotify])
-    else
-	found_libnotify="yes"
-	dnl make sure pkg-config says that libnotify is present.
-	LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no"
-	LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no"
-	if test "$found_libnotify" = "no" ; then
-	    found_libnotify=yes
-	    LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no"
-	    LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no"
-	fi
-	AC_MSG_RESULT([$found_libnotify])
-    fi
-    if test $enable_libnotify = "yes" ; then
-	UNIX_LIBNOTIFY_OBJS=tkUnixSysNotify.o
-	AC_DEFINE(HAVE_LIBNOTIFY, 1, [Have we turned on libnotify?])
-    else
-	UNIX_LIBNOTIFY_OBJS=""
-    fi
-    AC_SUBST(LIBNOTIFY_CFLAGS)
-    AC_SUBST(LIBNOTIFY_LIBS)
-    AC_SUBST(UNIX_LIBNOTIFY_OBJS)
-fi
-
-#--------------------------------------------------------------------
 # XXX Do this last.
 # It might modify XLIBSW which could affect other tests.
 #