summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgeorgeps <georgeps>2004-07-05 22:27:12 (GMT)
committergeorgeps <georgeps>2004-07-05 22:27:12 (GMT)
commit0197b111337141f0231c4621550d69c02147c8a4 (patch)
tree42bb1363a6e198207d18c465ca0a837ffd20763c
parente8809da1d2cb4e46c946ed54c986438049390981 (diff)
downloadtk-0197b111337141f0231c4621550d69c02147c8a4.zip
tk-0197b111337141f0231c4621550d69c02147c8a4.tar.gz
tk-0197b111337141f0231c4621550d69c02147c8a4.tar.bz2
The usage of the TK_XIM_SPOT definition was causing a build failure with some systems. I changed the function prototype and the CreateXIMSpot block to work correctly.
-rw-r--r--generic/tkEvent.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 16e4cfb..cd0daaf 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.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: tkEvent.c,v 1.21 2004/07/02 23:36:24 georgeps Exp $
+ * RCS: @(#) $Id: tkEvent.c,v 1.22 2004/07/05 22:27:12 georgeps Exp $
*/
#include "tkPort.h"
@@ -213,12 +213,12 @@ static TkWindow * GetTkWindowFromXEvent _ANSI_ARGS_((XEvent *eventPtr));
#ifdef TK_USE_INPUT_METHODS
static int InvokeInputMethods _ANSI_ARGS_((TkWindow *winPtr,
XEvent *eventPtr));
-#endif
-
#if TK_XIM_SPOT
static void CreateXIMSpotMethods _ANSI_ARGS_((TkWindow *winPtr));
#endif
+#endif /* TK_USE_INPUT_METHODS */
+
static int InvokeMouseHandlers _ANSI_ARGS_((TkWindow *winPtr,
unsigned long mask, XEvent *eventPtr));
@@ -329,7 +329,7 @@ InvokeMouseHandlers(winPtr, mask, eventPtr)
*
*---------------------------------------------------------
*/
-#if TK_XIM_SPOT
+#if defined(TK_USE_INPUT_METHODS) && TK_XIM_SPOT
static void
CreateXIMSpotMethods(winPtr)
TkWindow *winPtr;
@@ -379,7 +379,7 @@ CreateXIMSpotMethods(winPtr)
NULL);
}
}
-#endif /*TK_XIM_SPOT*/
+#endif
/*
*----------------------------------------------------------