summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2001-09-21 22:08:19 (GMT)
committerhobbs <hobbs>2001-09-21 22:08:19 (GMT)
commit2ca21e11c3a446f76d05ebfb5838888412dc8b9b (patch)
tree4f073c570ad43e2899740bf9933e020f4774dce6
parentcefbb7ae9a834a76562971896f9909f2e6a35e2a (diff)
downloadtk-2ca21e11c3a446f76d05ebfb5838888412dc8b9b.zip
tk-2ca21e11c3a446f76d05ebfb5838888412dc8b9b.tar.gz
tk-2ca21e11c3a446f76d05ebfb5838888412dc8b9b.tar.bz2
* generic/tkWindow.c (Tk_CreateAnonymousWindow):
* generic/tkEntry.c (GetSpinboxElement): fixed unreachable returns.
-rw-r--r--ChangeLog3
-rw-r--r--generic/tkEntry.c4
-rw-r--r--generic/tkWindow.c4
3 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c20386f..c54e945 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2001-09-21 Jeff Hobbs <jeffh@ActiveState.com>
+ * generic/tkWindow.c (Tk_CreateAnonymousWindow):
+ * generic/tkEntry.c (GetSpinboxElement): fixed unreachable returns.
+
* win/tkWinX.c (TkGetServerInfo): added recognition of Win64.
* xlib/X11/X.h: made XID __int64 type for Win64.
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 233fd90..43c3429 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.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: tkEntry.c,v 1.22 2001/08/29 23:22:24 hobbs Exp $
+ * RCS: @(#) $Id: tkEntry.c,v 1.23 2001/09/21 22:08:19 hobbs Exp $
*/
#include "tkInt.h"
@@ -4344,8 +4344,6 @@ GetSpinboxElement(sbPtr, x, y)
} else {
return SEL_BUTTONUP;
}
- } else {
- return SEL_ENTRY;
}
return SEL_ENTRY;
}
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 3a9f911..4316f31 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.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: tkWindow.c,v 1.36 2001/09/21 21:34:10 hobbs Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.37 2001/09/21 22:08:19 hobbs Exp $
*/
#include "tkPort.h"
@@ -1049,8 +1049,6 @@ Tk_CreateAnonymousWindow(interp, parent, screenName)
if (NameWindow(interp, winPtr, parentPtr, (char *)NULL) != TCL_OK) {
Tk_DestroyWindow((Tk_Window) winPtr);
return NULL;
- } else {
- return (Tk_Window) winPtr;
}
return (Tk_Window) winPtr;
} else {