summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2002-06-14 23:49:12 (GMT)
committermdejong <mdejong>2002-06-14 23:49:12 (GMT)
commit8c25ff2220dff2b96797b78bdfe3ce8ae77b8e37 (patch)
tree25a83fd7a9e43641fe306a2572bfd71593156a1c
parentc8b90bd37ebfc5309f42219ef44b28ba2ba3d23e (diff)
downloadtk-8c25ff2220dff2b96797b78bdfe3ce8ae77b8e37.zip
tk-8c25ff2220dff2b96797b78bdfe3ce8ae77b8e37.tar.gz
tk-8c25ff2220dff2b96797b78bdfe3ce8ae77b8e37.tar.bz2
* generic/tkBind.c (TkXErrorHandler): Declare static
function to avoid compiler error with VC++.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkEvent.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index aa7eed5..e2a45be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-06-14 Mo DeJong <mdejong@users.sourceforge.net>
+ * generic/tkBind.c (TkXErrorHandler): Declare static
+ function to avoid compiler error with VC++.
+
+2002-06-14 Mo DeJong <mdejong@users.sourceforge.net>
+
* generic/tkBind.c (ExpandPercents): Cast argument to
Tk_GetAtomName in order to avoid compiler warning.
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 4f40873..68887f1 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -11,7 +11,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.10 2002/06/14 22:25:12 jenglish Exp $
+ * RCS: @(#) $Id: tkEvent.c,v 1.11 2002/06/14 23:49:13 mdejong Exp $
*/
#include "tkPort.h"
@@ -161,6 +161,8 @@ static Tcl_ThreadDataKey dataKey;
static void DelayedMotionProc _ANSI_ARGS_((ClientData clientData));
static int WindowEventProc _ANSI_ARGS_((Tcl_Event *evPtr,
int flags));
+static int TkXErrorHandler _ANSI_ARGS_((ClientData clientData,
+ XErrorEvent *errEventPtr));
/*