Reversed the order of the checks for None or a Dialog where a Window is expected so it doesn't crash under OSX/Mach-o.

jackjansen · jackjansen · commit 4edc5eb6396f · 2001-06-20T21:20:22.000Z
diff --git a/Mac/Modules/win/Winmodule.c b/Mac/Modules/win/Winmodule.c
@@ -76,7 +76,10 @@ PyObject *WinObj_New(WindowPtr itself)
 }
 WinObj_Convert(PyObject *v, WindowPtr *p_itself)
 {
-#if 1
+
+	if (v == Py_None) { *p_itself = NULL; return 1; }
+	if (PyInt_Check(v)) { *p_itself = (WindowPtr)PyInt_AsLong(v); return 1; }
+
 	{
 		DialogRef dlg;
 		if (DlgObj_Convert(v, &dlg) && dlg) {
@@ -85,16 +88,6 @@ WinObj_Convert(PyObject *v, WindowPtr *p_itself)
 		}
 		PyErr_Clear();
 	}
-#else
-	if (DlgObj_Check(v)) {
-		*p_itself = DlgObj_ConvertToWindow(v);
-		return 1;
-	}
-#endif
-
-	if (v == Py_None) { *p_itself = NULL; return 1; }
-	if (PyInt_Check(v)) { *p_itself = (WindowPtr)PyInt_AsLong(v); return 1; }
-
 	if (!WinObj_Check(v))
 	{
 		PyErr_SetString(PyExc_TypeError, "Window required");
diff --git a/Mac/Modules/win/winsupport.py b/Mac/Modules/win/winsupport.py
@@ -137,7 +137,10 @@ def outputInitStructMembers(self):
 		Output("it->ob_freeit = PyMac_AutoDisposeWindow;")
 		OutRbrace()
 	def outputCheckConvertArg(self):
-		Output("#if 1")
+		Out("""
+		if (v == Py_None) { *p_itself = NULL; return 1; }
+		if (PyInt_Check(v)) { *p_itself = (WindowPtr)PyInt_AsLong(v); return 1; }
+		""")
 		OutLbrace()
 		Output("DialogRef dlg;")
 		OutLbrace("if (DlgObj_Convert(v, &dlg) && dlg)")
@@ -146,16 +149,6 @@ def outputCheckConvertArg(self):
 		OutRbrace()
 		Output("PyErr_Clear();")
 		OutRbrace()
-		Output("#else")
-		OutLbrace("if (DlgObj_Check(v))")
-		Output("*p_itself = DlgObj_ConvertToWindow(v);")
-		Output("return 1;")
-		OutRbrace()
-		Output("#endif")
-		Out("""
-		if (v == Py_None) { *p_itself = NULL; return 1; }
-		if (PyInt_Check(v)) { *p_itself = (WindowPtr)PyInt_AsLong(v); return 1; }
-		""")
 	def outputCleanupStructMembers(self):
 		Output("if (self->ob_freeit && self->ob_itself)")
 		OutLbrace()

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,10 @@ PyObject *WinObj_New(WindowPtr itself)`
`76`	`76`	`}`
`77`	`77`	`WinObj_Convert(PyObject v, WindowPtr p_itself)`
`78`	`78`	`{`
`79`		`-#if 1`
	`79`	`+`
	`80`	`+ if (v == Py_None) { *p_itself = NULL; return 1; }`
	`81`	`+ if (PyInt_Check(v)) { *p_itself = (WindowPtr)PyInt_AsLong(v); return 1; }`
	`82`	`+`
`80`	`83`	`{`
`81`	`84`	`DialogRef dlg;`
`82`	`85`	`if (DlgObj_Convert(v, &dlg) && dlg) {`
`@@ -85,16 +88,6 @@ WinObj_Convert(PyObject v, WindowPtr p_itself)`
`85`	`88`	`}`
`86`	`89`	`PyErr_Clear();`
`87`	`90`	`}`
`88`		`-#else`
`89`		`- if (DlgObj_Check(v)) {`
`90`		`- *p_itself = DlgObj_ConvertToWindow(v);`
`91`		`- return 1;`
`92`		`- }`
`93`		`-#endif`
`94`		`-`
`95`		`- if (v == Py_None) { *p_itself = NULL; return 1; }`
`96`		`- if (PyInt_Check(v)) { *p_itself = (WindowPtr)PyInt_AsLong(v); return 1; }`
`97`		`-`
`98`	`91`	`if (!WinObj_Check(v))`
`99`	`92`	`{`
`100`	`93`	`PyErr_SetString(PyExc_TypeError, "Window required");`