From 3c8ba7a1eac574a6377e3c1642fb96c32cfca073 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Wed, 5 Feb 1992 11:15:00 +0000
Subject: [PATCH] Fixed getargs() call in setfont. Improved setwincursor() to
 allow None to explicitly turn the cursor off.

---
 Modules/stdwinmodule.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Modules/stdwinmodule.c b/Modules/stdwinmodule.c
index 5556f031a8b..d3ecfb87d87 100644
--- a/Modules/stdwinmodule.c
+++ b/Modules/stdwinmodule.c
@@ -612,7 +612,7 @@ drawing_setfont(self, args)
 	char style = '\0';
 	int size = 0;
 	if (args == NULL || !is_tupleobject(args)) {
-		if (!getargs(args, "z", font))
+		if (!getargs(args, "z", &font))
 			return NULL;
 	}
 	else {
@@ -1596,12 +1596,16 @@ window_setwincursor(self, args)
 {
 	char *name;
 	CURSOR *c;
-	if (!getstrarg(args, &name))
-		return NULL;
-	c = wfetchcursor(name);
-	if (c == NULL) {
-		err_setstr(StdwinError, "no such cursor");
+	if (!getargs(args, "z", &name))
 		return NULL;
+	if (name == NULL)
+		c = NULL;
+	else {
+		c = wfetchcursor(name);
+		if (c == NULL) {
+			err_setstr(StdwinError, "no such cursor");
+			return NULL;
+		}
 	}
 	wsetwincursor(self->w_win, c);
 	INCREF(None);