From ac6bd28bf31387c1a3a31b86303c32867d13038b Mon Sep 17 00:00:00 2001 From: "Andrew M. Kuchling" Date: Sat, 14 Jul 2001 20:38:30 +0000 Subject: Fix bug #417212: "curses.newwin can return pads" by changing the Python newwin() wrapper to always return a window, and never a pad. This makes the code match the documentation. --- Modules/_cursesmodule.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Modules/_cursesmodule.c') diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index beb8c7ef86..0360994c34 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -2051,7 +2051,7 @@ static PyObject * PyCurses_NewWindow(PyObject *self, PyObject *args) { WINDOW *win; - int nlines, ncols, begin_y, begin_x; + int nlines, ncols, begin_y=0, begin_x=0; PyCursesInitialised @@ -2059,19 +2059,18 @@ PyCurses_NewWindow(PyObject *self, PyObject *args) case 2: if (!PyArg_Parse(args,"(ii);nlines,ncols",&nlines,&ncols)) return NULL; - win = newpad(nlines, ncols); break; case 4: if (!PyArg_Parse(args, "(iiii);nlines,ncols,begin_y,begin_x", &nlines,&ncols,&begin_y,&begin_x)) return NULL; - win = newwin(nlines,ncols,begin_y,begin_x); break; default: PyErr_SetString(PyExc_TypeError, "newwin requires 2 or 4 arguments"); return NULL; } + win = newwin(nlines,ncols,begin_y,begin_x); if (win == NULL) { PyErr_SetString(PyCursesError, catchall_NULL); return NULL; -- cgit v1.2.1