Pyxform/Modules/bitmaps.c

@@ -28,11 +28,11 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char bmp_create__doc__[] =
-    "Creates a bitmap"
+"Creates a bitmap"
-    ;
+;
 
 static PyObject *
-bmp_create(self, args)
+ bmp_create(self, args)
 PyObject *self;			/* Not used */
 PyObject *args;
 {
@@ -47,11 +47,11 @@ PyObject *args;
 }
 
 static char bmp_set_data__doc__[] =
-    "Sets the bitmap's data"
+"Sets the bitmap's data"
-    ;
+;
 
 static PyObject *
-bmp_set_data(self, args)
+ bmp_set_data(self, args)
 PyObject *self;			/* Not used */
 PyObject *args;
 {
@@ -69,11 +69,11 @@ PyObject *args;
 
 
 static char bmp_set_file__doc__[] =
-    "Loads a file into a bitmap"
+"Loads a file into a bitmap"
-    ;
+;
 
 static PyObject *
-bmp_set_file(self, args)
+ bmp_set_file(self, args)
 PyObject *self;			/* Not used */
 PyObject *args;
 {
@@ -103,12 +103,11 @@ static struct PyMethodDef bmp_methods[] =
 /* Initialization function for the module (*must* be called initbitmap) */
 
 static char bitmaps_module_documentation[] =
-    ""
+""
-    ;
+;
 
 
-static struct PyModuleDef moduledef =
+static struct PyModuleDef moduledef = {
-{
 	PyModuleDef_HEAD_INIT,
 	"bitmaps",
 	bitmaps_module_documentation,

Pyxform/Modules/box.c

@@ -29,13 +29,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char box_create__doc__[] =
-    "Creates a Box"
+"Creates a Box"
-    ;
+;
 
 static PyObject *
 box_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int	t,x,y,w,h;
 	char	*l;
@@ -50,8 +50,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef box_methods[] =
+static struct PyMethodDef box_methods[] = {
-{
 	{"create",	box_create,	1,	box_create__doc__}, 
 	{NULL,		NULL}		/* sentinel */
 };
@@ -60,12 +59,11 @@ static struct PyMethodDef box_methods[] =
 /* Initialization function for the module (*must* be called initbox) */
 
 static char box_module_documentation[] = 
-    ""
+""
-    ;
+;
 
 
-static struct PyModuleDef moduledef =
+static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "box", /* m_name */
     box_module_documentation,      /* m_doc */
@@ -75,7 +73,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_box()

Pyxform/Modules/browser.c

@@ -29,13 +29,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char browser_create__doc__[] =
-    "Creates a Browser"
+"Creates a Browser"
-    ;
+;
 
 static PyObject *
 browser_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int 	t,x,y,w,h;
 	char	*l;
@@ -48,13 +48,13 @@ PyObject *args;
 }
 
 static char browser_add_line__doc__[] =
-    "Adds a line to a browser"
+"Adds a line to a browser"
-    ;
+;
 
 static PyObject *
 browser_add_line(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	*l;
@@ -67,13 +67,13 @@ PyObject *args;
 }
 
 static char browser_addto__doc__[] =
-    "Adds a line to a browser, and shifts it there"
+"Adds a line to a browser, and shifts it there"
-    ;
+;
 
 static PyObject *
 browser_addto(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	*l;
@@ -86,13 +86,13 @@ PyObject *args;
 }
 
 static char browser_insert_line__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 browser_insert_line(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	n;
@@ -106,13 +106,13 @@ PyObject *args;
 }
 
 static char browser_delete_line__doc__[] =
-    "Deletes a line from a browser"
+"Deletes a line from a browser"
-    ;
+;
 
 static PyObject *
 browser_delete_line(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	n;
@@ -125,13 +125,13 @@ PyObject *args;
 }
 
 static char browser_replace_line__doc__[] =
-    "Replaces a line of abrowser"
+"Replaces a line of abrowser"
-    ;
+;
 
 static PyObject *
 browser_replace_line(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	n;
@@ -145,13 +145,13 @@ PyObject *args;
 }
 
 static char browser_get_line__doc__[] =
-    "Gets a browser's line"
+"Gets a browser's line"
-    ;
+;
 
 static PyObject *
 browser_get_line(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	n;
@@ -164,13 +164,13 @@ PyObject *args;
 }
 
 static char browser_load__doc__[] =
-    "Loads a file into a browser"
+"Loads a file into a browser"
-    ;
+;
 
 static PyObject *
 browser_load(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	*s;
@@ -183,13 +183,13 @@ PyObject *args;
 }
 
 static char browser_select_line__doc__[] =
-    "Selects a browser line"
+"Selects a browser line"
-    ;
+;
 
 static PyObject *
 browser_select_line(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	n;
@@ -202,13 +202,13 @@ PyObject *args;
 }
 
 static char browser_deselect_line__doc__[] =
-    "Deselects a browser's line"
+"Deselects a browser's line"
-    ;
+;
 
 static PyObject *
 browser_deselect_line(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	n;
@@ -222,13 +222,13 @@ PyObject *args;
 
 
 static char browser_deselect__doc__[] =
-    "Deselects all lines in a browser"
+"Deselects all lines in a browser"
-    ;
+;
 
 static PyObject *
 browser_deselect(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 
@@ -241,13 +241,13 @@ PyObject *args;
 
 
 static char browser_isselected_line__doc__[] =
-    "Is that line selected in the browser?"
+"Is that line selected in the browser?"
-    ;
+;
 
 static PyObject *
 browser_isselected_line(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	n,r;
@@ -259,13 +259,13 @@ PyObject *args;
 }
 
 static char browser_get_topline__doc__[] =
-    "The number of the 1st visible line in the browser"
+"The number of the 1st visible line in the browser"
-    ;
+;
 
 static PyObject *
 browser_get_topline(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long 	o;
 	int	r;
@@ -277,13 +277,13 @@ PyObject *args;
 }
 
 static char browser_get__doc__[] =
-    "You better read the xforms manual on fl_get_browser for this one..."
+"You better read the xforms manual on fl_get_browser for this one..."
-    ;
+;
 
 static PyObject *
 browser_get(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	r;
@@ -295,13 +295,13 @@ PyObject *args;
 }
 
 static char browser_get_maxline__doc__[] =
-    "Returns the number of lines in the browser"
+"Returns the number of lines in the browser"
-    ;
+;
 
 static PyObject *
 browser_get_maxline(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	r;
@@ -313,13 +313,13 @@ PyObject *args;
 }
 
 static char browser_get_screenlines__doc__[] =
-    "Returns the number of visible lines in the browser"
+"Returns the number of visible lines in the browser"
-    ;
+;
 
 static PyObject *
 browser_get_screenlines(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	r;
@@ -331,13 +331,13 @@ PyObject *args;
 }
 
 static char browser_set_topline__doc__[] =
-    "Sets the browser's first visible line"
+"Sets the browser's first visible line"
-    ;
+;
 
 static PyObject *
 browser_set_topline(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;	
 	int	n;
@@ -350,13 +350,13 @@ PyObject *args;
 }
 
 static char browser_set_fontsize__doc__[] =
-    "Set the browser's font size"
+"Set the browser's font size"
-    ;
+;
 
 static PyObject *
 browser_set_fontsize(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	s;
@@ -369,13 +369,13 @@ PyObject *args;
 }
 
 static char browser_set_fontstyle__doc__[] =
-    "Set the browser's font style"
+"Set the browser's font style"
-    ;
+;
 
 static PyObject *
 browser_set_fontstyle(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	s;
@@ -388,13 +388,13 @@ PyObject *args;
 }
 
 static char browser_set_specialkey__doc__[] =
-    "Set the character used to change text formatting in the browser"
+"Set the character used to change text formatting in the browser"
-    ;
+;
 
 static PyObject *
 browser_set_specialkey(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	s;
@@ -427,8 +427,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef browser_methods[] =
+static struct PyMethodDef browser_methods[] = {
-{
 	{"create",	browser_create,	1,	browser_create__doc__},
  {"add_line",	browser_add_line,	1,	browser_add_line__doc__},
  {"addto",	browser_addto,	1,	browser_addto__doc__},
@@ -458,11 +457,10 @@ static struct PyMethodDef browser_methods[] =
 /* Initialization function for the module (*must* be called initbrowser) */
 
 static char browser_module_documentation[] = 
-    ""
+""
-    ;
+;
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "browser", /* m_name */
     browser_module_documentation,      /* m_doc */
@@ -472,7 +470,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_browser()

Pyxform/Modules/button.c

@@ -29,13 +29,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char button_create__doc__[] =
-    "Creates a normal button"
+"Creates a normal button"
-    ;
+;
 
 static PyObject *
 button_create(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    o;
 	int     t,x,y,w,h;
@@ -48,14 +48,14 @@ PyObject *args;
 }
 
 static char button_create_round__doc__[] =
-    "Creates a round button"
+"Creates a round button"
-    ;
+;
 
 
 static PyObject *
 button_create_round(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    o;
 	int     t,x,y,w,h;
@@ -68,13 +68,13 @@ PyObject *args;
 }
 
 static char button_create_light__doc__[] =
-    "Creates a light button"
+"Creates a light button"
-    ;
+;
 
 static PyObject *
 button_create_light(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    o;
 	int     t,x,y,w,h;
@@ -87,13 +87,13 @@ PyObject *args;
 }
 
 static char button_create_check__doc__[] =
-    "Creates a check button"
+"Creates a check button"
-    ;
+;
 
 static PyObject *
 button_create_check(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    o;
 	int     t,x,y,w,h;
@@ -106,13 +106,13 @@ PyObject *args;
 }
 
 static char button_create_bitmap__doc__[] =
-    "Creates a bitmap button"
+"Creates a bitmap button"
-    ;
+;
 
 static PyObject *
 button_create_bitmap(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    o;
 	int     t,x,y,w,h;
@@ -126,13 +126,13 @@ PyObject *args;
 
 
 static char button_create_pixmap__doc__[] =
-    "Creates a pixmap button"
+"Creates a pixmap button"
-    ;
+;
 
 static PyObject *
 button_create_pixmap(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    o;
 	int     t,x,y,w,h;
@@ -145,13 +145,13 @@ PyObject *args;
 }
 
 static char button_set_bitmap_data__doc__[] =
-    "XXXXXXNot implemented"
+"XXXXXXNot implemented"
-    ;
+;
 
 static PyObject *
 button_set_bitmap_data(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -161,13 +161,13 @@ PyObject *args;
 }
 
 static char button_set_bitmap_file__doc__[] =
-    "XXXXXXNot implemented"
+"XXXXXXNot implemented"
-    ;
+;
 
 static PyObject *
 button_set_bitmap_file(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -177,13 +177,13 @@ PyObject *args;
 }
 
 static char button_set_pixmap_data__doc__[] =
-    "XXXXXXNot implemented"
+"XXXXXXNot implemented"
-    ;
+;
 
 static PyObject *
 button_set_pixmap_data(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -193,13 +193,13 @@ PyObject *args;
 }
 
 static char button_set_pixmap_file__doc__[] =
-    "XXXXXXNot implemented"
+"XXXXXXNot implemented"
-    ;
+;
 
 static PyObject *
 button_set_pixmap_file(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -209,13 +209,13 @@ PyObject *args;
 }
 
 static char button_set_pixmap_pixmap__doc__[] =
-    "XXXXXXNot implemented"
+"XXXXXXNot implemented"
-    ;
+;
 
 static PyObject *
 button_set_pixmap_pixmap(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -225,13 +225,13 @@ PyObject *args;
 }
 
 static char button_get_pixmap_pixmap__doc__[] =
-    "XXXXXXNot implemented"
+"XXXXXXNot implemented"
-    ;
+;
 
 static PyObject *
 button_get_pixmap_pixmap(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -241,13 +241,13 @@ PyObject *args;
 }
 
 static char button_get__doc__[] =
-    "Gets the button's value"
+"Gets the button's value"
-    ;
+;
 
 static PyObject *
 button_get(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	r;
@@ -259,13 +259,13 @@ PyObject *args;
 }
 
 static char button_set__doc__[] =
-    "Sets the button's value"
+"Sets the button's value"
-    ;
+;
 
 static PyObject *
 button_set(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	v;
@@ -278,13 +278,13 @@ PyObject *args;
 }
 
 static char button_get_numb__doc__[] =
-    "Get's the number of the mouse button last pressed on the button object"
+"Get's the number of the mouse button last pressed on the button object"
-    ;
+;
 
 static PyObject *
 button_get_numb(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	n;
@@ -296,13 +296,13 @@ PyObject *args;
 }
 
 static char button_create_generic__doc__[] =
-    "Creates a generic button (useful mainly for extensions)"
+"Creates a generic button (useful mainly for extensions)"
-    ;
+;
 
 static PyObject *
 button_create_generic(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int     c,t,x,y,w,h;
 	char    *l;
@@ -316,8 +316,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef button_methods[] =
+static struct PyMethodDef button_methods[] = {
-{
 	{"create",	button_create,	1,	button_create__doc__},
  {"create_round",	button_create_round,	1,	button_create_round__doc__},
  {"create_light",	button_create_light,	1,	button_create_light__doc__},
@@ -342,11 +341,10 @@ static struct PyMethodDef button_methods[] =
 /* Initialization function for the module (*must* be called initbutton) */
 
 static char button_module_documentation[] = 
-    ""
+""
-    ;
+;
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "button", /* m_name */
     button_module_documentation,      /* m_doc */
@@ -356,7 +354,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_button()
@@ -364,7 +362,7 @@ PyInit_button()
 	PyObject *m, *d;
 
 	/* Create the module and add the functions */
-    m = PyModule_Create(&moduledef);
+m = PyModule_Create(&moduledef);
 	/* Add some symbolic constants to the module */
 	d = PyModule_GetDict(m);
 	ErrorObject = PyBytes_FromString("button.error");

Pyxform/Modules/choice.c

@@ -30,13 +30,13 @@ static PyObject *ErrorObject;
 
 
 static char choice_create__doc__[] =
-    "Creates a choice object"
+"Creates a choice object"
-    ;
+;
 
 static PyObject *
 choice_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int	t,x,y,w,h;
 	char 	*l;
@@ -50,13 +50,13 @@ PyObject *args;
 
 
 static char choice_clear__doc__[] =
-    "Clears the list of choices"
+"Clears the list of choices"
-    ;
+;
 
 static PyObject *
 choice_clear(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 
@@ -68,13 +68,13 @@ PyObject *args;
 }
 
 static char choice_addto__doc__[] =
-    "Adds a line to a choice object"
+"Adds a line to a choice object"
-    ;
+;
 
 static PyObject *
 choice_addto(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	*t;
@@ -87,13 +87,13 @@ PyObject *args;
 }
 
 static char choice_replace__doc__[] =
-    "Replaces a line in a choice"
+"Replaces a line in a choice"
-    ;
+;
 
 static PyObject *
 choice_replace(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	l;
@@ -107,13 +107,13 @@ PyObject *args;
 }
 
 static char choice_delete__doc__[] =
-    "Deletes a line in a choice"
+"Deletes a line in a choice"
-    ;
+;
 
 static PyObject *
 choice_delete(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	l;
@@ -126,13 +126,13 @@ PyObject *args;
 }
 
 static char choice_set__doc__[] =
-    "Sets the choice"
+"Sets the choice"
-    ;
+;
 
 static PyObject *
 choice_set(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	l;
@@ -145,13 +145,13 @@ PyObject *args;
 }
 
 static char choice_set_text__doc__[] =
-    "Sets the choice at the item with the given text"
+"Sets the choice at the item with the given text"
-    ;
+;
 
 static PyObject *
 choice_set_text(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	*t;
@@ -164,13 +164,13 @@ PyObject *args;
 }
 
 static char choice_get__doc__[] =
-    "Gets the choice's selected option number"
+"Gets the choice's selected option number"
-    ;
+;
 
 static PyObject *
 choice_get(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	r;
@@ -182,13 +182,13 @@ PyObject *args;
 }
 
 static char choice_get_maxitems__doc__[] =
-    "Gets the total number of items in the choice"
+"Gets the total number of items in the choice"
-    ;
+;
 
 static PyObject *
 choice_get_maxitems(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	r;
@@ -200,13 +200,13 @@ PyObject *args;
 }
 
 static char choice_get_text__doc__[] =
-    "Gets the text of the current choice"
+"Gets the text of the current choice"
-    ;
+;
 
 static PyObject *
 choice_get_text(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	t[2048];
@@ -218,13 +218,13 @@ PyObject *args;
 }
 
 static char choice_set_fontsize__doc__[] =
-    "Sets the choice's fontsize"
+"Sets the choice's fontsize"
-    ;
+;
 
 static PyObject *
 choice_set_fontsize(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -237,13 +237,13 @@ PyObject *args;
 }
 
 static char choice_set_align__doc__[] =
-    "Sets the alignment of the choice"
+"Sets the alignment of the choice"
-    ;
+;
 
 static PyObject *
 choice_set_align(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -256,13 +256,13 @@ PyObject *args;
 }
 
 static char choice_set_item_mode__doc__[] =
-    "Sets an item's mode ?"
+"Sets an item's mode ?"
-    ;
+;
 
 static PyObject *
 choice_set_item_mode(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long		o;
 	int		n;
@@ -276,13 +276,13 @@ PyObject *args;
 }
 
 static char choice_set_item_shortcut__doc__[] =
-    "XXXXXXNot implemented"
+"XXXXXXNot implemented"
-    ;
+;
 
 static PyObject *
 choice_set_item_shortcut(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -293,8 +293,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef choice_methods[] =
+static struct PyMethodDef choice_methods[] = {
-{
 	{"create",	choice_create,	1,	choice_create__doc__},
 	{"clear",	choice_clear,	1,	choice_clear__doc__},
  {"addto",	choice_addto,	1,	choice_addto__doc__},
@@ -317,12 +316,11 @@ static struct PyMethodDef choice_methods[] =
 /* Initialization function for the module (*must* be called initchoice) */
 
 static char choice_module_documentation[] = 
-    ""
+""
-    ;
+;
 
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "choice", /* m_name */
     choice_module_documentation,      /* m_doc */
@@ -332,7 +330,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_choice()

Pyxform/Modules/clock.c

@@ -28,13 +28,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char clock_create__doc__[] =
-    "Creates a clock"
+"Creates a clock"
-    ;
+;
 
 static PyObject *
 clock_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int	t,x,y,w,h;
 	char	*l;
@@ -47,13 +47,13 @@ PyObject *args;
 }
 
 static char clock_get__doc__[] =
-    "Gets the current time"
+"Gets the current time"
-    ;
+;
 
 static PyObject *
 clock_get(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	h,m,s;
@@ -66,8 +66,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef clock_methods[] =
+static struct PyMethodDef clock_methods[] = {
-{
 	{"create",	clock_create,	1,	clock_create__doc__},
  {"get",	clock_get,	1,	clock_get__doc__},
  
@@ -78,11 +77,10 @@ static struct PyMethodDef clock_methods[] =
 /* Initialization function for the module (*must* be called initclock) */
 
 static char clock_module_documentation[] = 
-    ""
+""
-    ;
+;
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "clock", /* m_name */
     clock_module_documentation,      /* m_doc */
@@ -92,7 +90,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 
 PyMODINIT_FUNC

Pyxform/Modules/counter.c

@@ -28,13 +28,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char counter_create__doc__[] =
-    "Creates a counter"
+"Creates a counter"
-    ;
+;
 
 static PyObject *
 counter_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int	t,x,y,w,h;
 	char	*l;
@@ -47,13 +47,13 @@ PyObject *args;
 }
 
 static char counter_set_value__doc__[] =
-    "Sets the value of the counter (Use only on visible counters!)"
+"Sets the value of the counter (Use only on visible counters!)"
-    ;
+;
 
 static PyObject *
 counter_set_value(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	v;	
@@ -66,13 +66,13 @@ PyObject *args;
 }
 
 static char counter_set_bounds__doc__[] =
-    "Sets the counter's max & min"
+"Sets the counter's max & min"
-    ;
+;
 
 static PyObject *
 counter_set_bounds(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	min,max;
@@ -85,13 +85,13 @@ PyObject *args;
 }
 
 static char counter_set_step__doc__[] =
-    "Set the counter's step size (small & large)"
+"Set the counter's step size (small & large)"
-    ;
+;
 
 static PyObject *
 counter_set_step(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	s,l;
@@ -104,13 +104,13 @@ PyObject *args;
 }
 
 static char counter_set_precision__doc__[] =
-    "Sets the counter's precision"
+"Sets the counter's precision"
-    ;
+;
 
 static PyObject *
 counter_set_precision(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	p;
@@ -123,13 +123,13 @@ PyObject *args;
 }
 
 static char counter_get_value__doc__[] =
-    "Returns the counter's value"
+"Returns the counter's value"
-    ;
+;
 
 static PyObject *
 counter_get_value(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	r;
@@ -141,13 +141,13 @@ PyObject *args;
 }
 
 static char counter_set_return__doc__[] =
-    "Makes the counter return always or when released"
+"Makes the counter return always or when released"
-    ;
+;
 
 static PyObject *
 counter_set_return(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -161,8 +161,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef counter_methods[] =
+static struct PyMethodDef counter_methods[] = {
-{
 	{"create",	counter_create,	1,	counter_create__doc__},
  {"set_value",	counter_set_value,	1,	counter_set_value__doc__},
  {"set_bounds",	counter_set_bounds,	1,	counter_set_bounds__doc__},
@@ -178,10 +177,9 @@ static struct PyMethodDef counter_methods[] =
 /* Initialization function for the module (*must* be called initcounter) */
 
 static char counter_module_documentation[] = 
-    ""
+""
-    ;
+;
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "counter", /* m_name */
     counter_module_documentation,      /* m_doc */
@@ -191,7 +189,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_counter()
@@ -199,7 +197,7 @@ PyInit_counter()
 	PyObject *m, *d;
 
 	/* Create the module and add the functions */
-    m = PyModule_Create(&moduledef);
+m = PyModule_Create(&moduledef);
 	/* Add some symbolic constants to the module */
 	d = PyModule_GetDict(m);
 	ErrorObject = PyBytes_FromString("counter.error");

Pyxform/Modules/dial.c

@@ -28,13 +28,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char dial_create__doc__[] =
-    "Creates a dial"
+"Creates a dial"
-    ;
+;
 
 static PyObject *
 dial_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int	t,x,y,w,h;
 	char	*l;
@@ -47,13 +47,13 @@ PyObject *args;
 }
 
 static char dial_set_value__doc__[] =
-    "Sets the dial value"
+"Sets the dial value"
-    ;
+;
 
 static PyObject *
 dial_set_value(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	v;
@@ -66,13 +66,13 @@ PyObject *args;
 }
 
 static char dial_get_value__doc__[] =
-    "Gets the dial's value"
+"Gets the dial's value"
-    ;
+;
 
 static PyObject *
 dial_get_value(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	r;
@@ -84,13 +84,13 @@ PyObject *args;
 }
 
 static char dial_set_bounds__doc__[] =
-    "Sets the dial bounds"
+"Sets the dial bounds"
-    ;
+;
 
 static PyObject *
 dial_set_bounds(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	min,max;
@@ -103,13 +103,13 @@ PyObject *args;
 }
 
 static char dial_get_bounds__doc__[] =
-    "Gets the dial bounds"
+"Gets the dial bounds"
-    ;
+;
 
 static PyObject *
 dial_get_bounds(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	min,max;
@@ -121,13 +121,13 @@ PyObject *args;
 }
 
 static char dial_set_step__doc__[] =
-    "Sets the dial step"
+"Sets the dial step"
-    ;
+;
 
 static PyObject *
 dial_set_step(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	s;
@@ -140,13 +140,13 @@ PyObject *args;
 }
 
 static char dial_set_return__doc__[] =
-    "Makes a dial return always or when released"
+"Makes a dial return always or when released"
-    ;
+;
 
 static PyObject *
 dial_set_return(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -160,8 +160,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef dial_methods[] =
+static struct PyMethodDef dial_methods[] = {
-{
 	{"create",	dial_create,	1,	dial_create__doc__},
  {"set_value",	dial_set_value,	1,	dial_set_value__doc__},
  {"get_value",	dial_get_value,	1,	dial_get_value__doc__},
@@ -177,11 +176,10 @@ static struct PyMethodDef dial_methods[] =
 /* Initialization function for the module (*must* be called initdial) */
 
 static char dial_module_documentation[] = 
-    ""
+""
-    ;
+;
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "dial", /* m_name */
     dial_module_documentation,      /* m_doc */
@@ -191,7 +189,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_dial()
@@ -199,7 +197,7 @@ PyInit_dial()
 	PyObject *m, *d;
 
 	/* Create the module and add the functions */
-    m = PyModule_Create(&moduledef);
+m = PyModule_Create(&moduledef);
 	/* Add some symbolic constants to the module */
 	d = PyModule_GetDict(m);
 	ErrorObject = PyBytes_FromString("dial.error");

Pyxform/Modules/forms.c

@@ -10,8 +10,8 @@ static char forms_create__doc__[] =
    ;
 
 static PyObject *
-forms_create(self, args)
+   forms_create(self, args)
-PyObject *self; /* Not used */
+   PyObject *self; /* Not used */
 PyObject *args;
 {
    int	box,w,h;
@@ -29,8 +29,8 @@ static char forms_freeze__doc__[] =
    ;
 
 static PyObject *
-forms_freeze(self, args)
+   forms_freeze(self, args)
-PyObject *self; /* Not used */
+   PyObject *self; /* Not used */
 PyObject *args;
 {
    long form;
@@ -47,8 +47,8 @@ static char forms_unfreeze__doc__[] =
    ;
 
 static PyObject *
-forms_unfreeze(self, args)
+   forms_unfreeze(self, args)
-PyObject *self; /* Not used */
+   PyObject *self; /* Not used */
 PyObject *args;
 {
    long form;
@@ -65,8 +65,8 @@ static char forms_deactivate__doc__[] =
    ;
 
 static PyObject *
-forms_deactivate(self, args)
+   forms_deactivate(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -83,8 +83,8 @@ static char forms_activate__doc__[] =
    ;
 
 static PyObject *
-forms_activate(self, args)
+   forms_activate(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long form;
@@ -100,8 +100,8 @@ static char forms_activate_all__doc__[] =
    ;
 
 static PyObject *
-forms_activate_all(self, args)
+   forms_activate_all(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -117,8 +117,8 @@ static char forms_deactivate_all__doc__[] =
    ;
 
 static PyObject *
-forms_deactivate_all(self, args)
+   forms_deactivate_all(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -134,8 +134,8 @@ static char forms_freeze_all__doc__[] =
    ;
 
 static PyObject *
-forms_freeze_all(self, args)
+   forms_freeze_all(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -152,8 +152,8 @@ static char forms_unfreeze_all__doc__[] =
    ;
 
 static PyObject *
-forms_unfreeze_all(self, args)
+   forms_unfreeze_all(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -169,8 +169,8 @@ static char forms_scale__doc__[] =
    ;
 
 static PyObject *
-forms_scale(self, args)
+   forms_scale(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	form;
@@ -188,8 +188,8 @@ static char forms_set_position__doc__[] =
    ;
 
 static PyObject *
-forms_set_position(self, args)
+   forms_set_position(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	form;
@@ -207,8 +207,8 @@ static char forms_set_property__doc__[] =
    ;
 
 static PyObject *
-forms_set_property(self, args)
+   forms_set_property(self, args)
-PyObject *self; /* Not used */
+   PyObject *self; /* Not used */
 PyObject *args;
 {
 
@@ -223,8 +223,8 @@ static char forms_unset_property__doc__[] =
    ;
 
 static PyObject *
-forms_unset_property(self, args)
+   forms_unset_property(self, args)
-PyObject *self; /* Not used */
+   PyObject *self; /* Not used */
 PyObject *args;
 {
 
@@ -239,8 +239,8 @@ static char forms_set_callback__doc__[] =
    ;
 
 static PyObject *
-forms_set_callback(self, args)
+   forms_set_callback(self, args)
-PyObject *self; /* Not used */
+   PyObject *self; /* Not used */
 PyObject *args;
 {
 
@@ -255,8 +255,8 @@ static char forms_set_size__doc__[] =
    ;
 
 static PyObject *
-forms_set_size(self, args)
+   forms_set_size(self, args)
-PyObject *self; /* Not used */
+   PyObject *self; /* Not used */
 PyObject *args;
 {
    long    form;
@@ -274,8 +274,8 @@ static char forms_set_hotspot__doc__[] =
    ;
 
 static PyObject *
-forms_set_hotspot(self, args)
+   forms_set_hotspot(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -291,8 +291,8 @@ static char forms_set_hotobject__doc__[] =
    ;
 
 static PyObject *
-forms_set_hotobject(self, args)
+   forms_set_hotobject(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -307,8 +307,8 @@ static char forms_set_minsize__doc__[] =
    ;
 
 static PyObject *
-forms_set_minsize(self, args)
+   forms_set_minsize(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	form;
@@ -327,8 +327,8 @@ static char forms_set_maxsize__doc__[] =
    ;
 
 static PyObject *
-forms_set_maxsize(self, args)
+   forms_set_maxsize(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	form;
@@ -347,8 +347,8 @@ static char forms_set_event_cmask__doc__[] =
    ;
 
 static PyObject *
-forms_set_event_cmask(self, args)
+   forms_set_event_cmask(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -363,8 +363,8 @@ static char forms_get_event_cmask__doc__[] =
    ;
 
 static PyObject *
-forms_get_event_cmask(self, args)
+   forms_get_event_cmask(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -379,8 +379,8 @@ static char forms_set_geometry__doc__[] =
    ;
 
 static PyObject *
-forms_set_geometry(self, args)
+   forms_set_geometry(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long 	form;
@@ -399,8 +399,8 @@ static char forms_get_geometry__doc__[] =
    ;
 
 static PyObject *
-forms_get_geometry(self, args)
+   forms_get_geometry(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long 	form;
@@ -420,8 +420,8 @@ static char forms_show__doc__[] =
    ;
 
 static PyObject *
-forms_show(self, args)
+   forms_show(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long 	form,ret;
@@ -439,8 +439,8 @@ static char forms_hide__doc__[] =
    ;
 
 static PyObject *
-forms_hide(self, args)
+   forms_hide(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	form;
@@ -457,8 +457,8 @@ static char forms_free__doc__[] =
    ;
 
 static PyObject *
-forms_free(self, args)
+   forms_free(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	form;
@@ -475,8 +475,8 @@ static char forms_redraw__doc__[] =
    ;
 
 static PyObject *
-forms_redraw(self, args)
+   forms_redraw(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	form;
@@ -493,8 +493,8 @@ static char forms_set_dblbuffer__doc__[] =
    ;
 
 static PyObject *
-forms_set_dblbuffer(self, args)
+   forms_set_dblbuffer(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	form;
@@ -512,8 +512,8 @@ static char forms_prepare_window__doc__[] =
    ;
 
 static PyObject *
-forms_prepare_window(self, args)
+   forms_prepare_window(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -528,8 +528,8 @@ static char forms_show_window__doc__[] =
    ;
 
 static PyObject *
-forms_show_window(self, args)
+   forms_show_window(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
 
@@ -545,8 +545,8 @@ static char forms_add_object__doc__[] =
    ;
 
 static PyObject *
-forms_add_object(self, args)
+   forms_add_object(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	f,o;
@@ -563,7 +563,7 @@ static char forms_get_attr__doc__[] =
    ;
 
 static PyObject *forms_get_attr(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	o;
@@ -585,8 +585,8 @@ static char forms_set_title__doc__[] =
    ;
 
 static PyObject *
-forms_set_title(self, args)
+   forms_set_title(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	form;
@@ -604,8 +604,8 @@ static char forms_get_title__doc__[] =
    ;
 
 static PyObject *
-forms_get_title(self, args)
+   forms_get_title(self, args)
-PyObject *self;	/* Not used */
+   PyObject *self;	/* Not used */
 PyObject *args;
 {
    long	form;
@@ -620,8 +620,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef forms_methods[] =
+static struct PyMethodDef forms_methods[] = {
-{
    {  "create",	                        forms_create,	1,	forms_create__doc__  },
       {  "freeze",	forms_freeze,	1,	forms_freeze__doc__  },
       {  "unfreeze",	forms_unfreeze,	1,	forms_unfreeze__doc__  },
@@ -667,8 +666,7 @@ static char forms_module_documentation[] =
    ""
    ;
 
-static struct PyModuleDef moduledef =
+   static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "forms", /* m_name */
     forms_module_documentation,      /* m_doc */
@@ -678,25 +676,25 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_forms()
-{
+   {
       PyObject *m, *d;
 
-    /* Create the module and add the functions */
+/* Create the module and add the functions */
       m = PyModule_Create(&moduledef);
 
-    /* Add some symbolic constants to the module */
+/* Add some symbolic constants to the module */
       d = PyModule_GetDict(m);
       ErrorObject = PyBytes_FromString("forms.error");
       PyDict_SetItemString(d, "error", ErrorObject);
 
-    /* XXXX Add constants here */
+/* XXXX Add constants here */
 
-    /* Check for errors */
+/* Check for errors */
       if (PyErr_Occurred())
          Py_FatalError("can't initialize module forms");
-}
+   }
 

Pyxform/Modules/frame.c

@@ -28,13 +28,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char frame_create__doc__[] =
-    "Creates a frame"
+"Creates a frame"
-    ;
+;
 
 static PyObject *
 frame_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int	t,x,y,w,h;
 	char	*l;
@@ -48,8 +48,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef frame_methods[] =
+static struct PyMethodDef frame_methods[] = {
-{
 	{"create",	frame_create,	1,	frame_create__doc__},
  
 	{NULL,		NULL}		/* sentinel */
@@ -59,11 +58,10 @@ static struct PyMethodDef frame_methods[] =
 /* Initialization function for the module (*must* be called initframe) */
 
 static char frame_module_documentation[] = 
-    ""
+""
-    ;
+;
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "frame", /* m_name */
     frame_module_documentation,      /* m_doc */
@@ -73,7 +71,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_frame()

Pyxform/Modules/goodies.c

@@ -5,13 +5,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char goodies_set_font__doc__[] =
-    "Sets the goodies font XXXXXXBroken?"
+"Sets the goodies font XXXXXXBroken?"
-    ;
+;
 
 static PyObject *
 goodies_set_font(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int i,j;
 	if (!PyArg_ParseTuple(args, "ii"),&i,&j)
@@ -22,13 +22,13 @@ PyObject *args;
 }
 
 static char goodies_show_message__doc__[] =
-    "Shows a message (3 lines)"
+"Shows a message (3 lines)"
-    ;
+;
 
 static PyObject *
 goodies_show_message(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	char *s1,*s2,*s3;
@@ -41,13 +41,13 @@ PyObject *args;
 }
 
 static char goodies_show_alert__doc__[] =
-    "Shows an alert message"
+"Shows an alert message"
-    ;
+;
 
 static PyObject *
 goodies_show_alert(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	char *s1,*s2,*s3;
 	int i;
@@ -60,13 +60,13 @@ PyObject *args;
 }
 
 static char goodies_show_question__doc__[] =
-    "Shows a question"
+"Shows a question"
-    ;
+;
 
 static PyObject *
 goodies_show_question(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	char *s1;
 	int v,r;
@@ -77,13 +77,13 @@ PyObject *args;
 }
 
 static char goodies_show_input__doc__[] =
-    "Asks a line of text"
+"Asks a line of text"
-    ;
+;
 
 static PyObject *
 goodies_show_input(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	char *s1,*s2,r[2048];
 
@@ -94,13 +94,13 @@ PyObject *args;
 }
 
 static char goodies_show_colormap__doc__[] =
-    "Shows a colormap"
+"Shows a colormap"
-    ;
+;
 
 static PyObject *
 goodies_show_colormap(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int i,r;
 
@@ -111,13 +111,13 @@ PyObject *args;
 }
 
 static char goodies_show_choice__doc__[] =
-    "Shows a choice"
+"Shows a choice"
-    ;
+;
 
 static PyObject *
 goodies_show_choice(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	char *s1,*s2,*s3,*s4,*s5,*s6;
 	int i1,i2,r;
@@ -129,13 +129,13 @@ PyObject *args;
 }
 
 static char goodies_set_choices_shortcut__doc__[] =
-    "Sets the choice's shortcuts"
+"Sets the choice's shortcuts"
-    ;
+;
 
 static PyObject *
 goodies_set_choices_shortcut(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	char *s1,*s2,*s3;
 
@@ -147,13 +147,13 @@ PyObject *args;
 }
 
 static char goodies_show_oneliner__doc__[] =
-    "Shows a one-liner"
+"Shows a one-liner"
-    ;
+;
 
 static PyObject *
 goodies_show_oneliner(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	char	*s1;
 	int	i,j;
@@ -166,13 +166,13 @@ PyObject *args;
 }
 
 static char goodies_hide_oneliner__doc__[] =
-    "Hides a oneliner"
+"Hides a oneliner"
-    ;
+;
 
 static PyObject *
 goodies_hide_oneliner(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -183,13 +183,13 @@ PyObject *args;
 }
 
 static char goodies_set_oneliner_font__doc__[] =
-    "Sets the oneliner font"
+"Sets the oneliner font"
-    ;
+;
 
 static PyObject *
 goodies_set_oneliner_font(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int i,j;
 
@@ -201,13 +201,13 @@ PyObject *args;
 }
 
 static char goodies_set_oneliner_color__doc__[] =
-    "Sets the oneliner color"
+"Sets the oneliner color"
-    ;
+;
 
 static PyObject *
 goodies_set_oneliner_color(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int i,j;
 
@@ -219,13 +219,13 @@ PyObject *args;
 }
 
 static char goodies_use_fselector__doc__[] =
-    "??"
+"??"
-    ;
+;
 
 static PyObject *
 goodies_use_fselector(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int i;
 
@@ -237,13 +237,13 @@ PyObject *args;
 }
 
 static char goodies_show_fselector__doc__[] =
-    "Shows a fselector"
+"Shows a fselector"
-    ;
+;
 
 static PyObject *
 goodies_show_fselector(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	char *s1,*s2,*s3,*s4,r[2048];
 
@@ -254,13 +254,13 @@ PyObject *args;
 }
 
 static char goodies_set_fselector_placement__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 goodies_set_fselector_placement(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int i;
 
@@ -272,13 +272,13 @@ PyObject *args;
 }
 
 static char goodies_set_fselector_callback__doc__[] =
-    "XXXXXX Not implemented"
+"XXXXXX Not implemented"
-    ;
+;
 
 static PyObject *
 goodies_set_fselector_callback(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -288,13 +288,13 @@ PyObject *args;
 }
 
 static char goodies_get_directory__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 goodies_get_directory(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	char r[2048];
 	if (!PyArg_ParseTuple(args, ""))
@@ -304,13 +304,13 @@ PyObject *args;
 }
 
 static char goodies_get_pattern__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 goodies_get_pattern(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	char r[2048];
 
@@ -321,13 +321,13 @@ PyObject *args;
 }
 
 static char goodies_get_filename__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 goodies_get_filename(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	char r[2048];
 
@@ -338,13 +338,13 @@ PyObject *args;
 }
 
 static char goodies_refresh_fselector__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 goodies_refresh_fselector(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -355,13 +355,13 @@ PyObject *args;
 }
 
 static char goodies_add_fselector_appbutton__doc__[] =
-    "XXXXXX Not implemented"
+"XXXXXX Not implemented"
-    ;
+;
 
 static PyObject *
 goodies_add_fselector_appbutton(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -371,13 +371,13 @@ PyObject *args;
 }
 
 static char goodies_disable_fselector_cache__doc__[] =
-    "XXXXXX Not implemented"
+"XXXXXX Not implemented"
-    ;
+;
 
 static PyObject *
 goodies_disable_fselector_cache(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -387,13 +387,13 @@ PyObject *args;
 }
 
 static char goodies_invalidate_fselector_cache__doc__[] =
-    "XXXXXX Not implemented"
+"XXXXXX Not implemented"
-    ;
+;
 
 static PyObject *
 goodies_invalidate_fselector_cache(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -403,13 +403,13 @@ PyObject *args;
 }
 
 static char goodies_get_fselector_form__doc__[] =
-    "XXXXXX Not implemented"
+"XXXXXX Not implemented"
-    ;
+;
 
 static PyObject *
 goodies_get_fselector_form(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -419,13 +419,13 @@ PyObject *args;
 }
 
 static char goodies_hide_fselector__doc__[] =
-    "Hides a fselector"
+"Hides a fselector"
-    ;
+;
 
 static PyObject *
 goodies_hide_fselector(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -437,8 +437,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef goodies_methods[] =
+static struct PyMethodDef goodies_methods[] = {
-{
 	{"set_font",	goodies_set_font,	1,	goodies_set_font__doc__},
  {"show_message",	goodies_show_message,	1,	goodies_show_message__doc__},
  {"show_alert",	goodies_show_alert,	1,	goodies_show_alert__doc__},
@@ -472,10 +471,9 @@ static struct PyMethodDef goodies_methods[] =
 /* Initialization function for the module (*must* be called initgoodies) */
 
 static char goodies_module_documentation[] = 
-    ""
+""
-    ;
+;
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "goodies", /* m_name */
     goodies_module_documentation,      /* m_doc */
@@ -485,7 +483,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_goodies()

Pyxform/Modules/input.c

@@ -28,13 +28,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char input_create__doc__[] =
-    "Creates an Input object"
+"Creates an Input object"
-    ;
+;
 
 static PyObject *
 input_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int	t,x,y,w,h;
 	char	*l;
@@ -47,13 +47,13 @@ PyObject *args;
 }
 
 static char input_set__doc__[] =
-    "Sets the contents of an input object"
+"Sets the contents of an input object"
-    ;
+;
 
 static PyObject *
 input_set(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	*s;
@@ -66,13 +66,13 @@ PyObject *args;
 }
 
 static char input_set_color__doc__[] =
-    "Sets the color of the input object's text"
+"Sets the color of the input object's text"
-    ;
+;
 
 static PyObject *
 input_set_color(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	c1,c2;
@@ -85,13 +85,13 @@ PyObject *args;
 }
 
 static char input_get__doc__[] =
-    "Gets the input's value"
+"Gets the input's value"
-    ;
+;
 
 static PyObject *
 input_get(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	r[2048];
@@ -103,13 +103,13 @@ PyObject *args;
 }
 
 static char input_set_return__doc__[] =
-    "Makes the input return always or when released"
+"Makes the input return always or when released"
-    ;
+;
 
 static PyObject *
 input_set_return(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -122,13 +122,13 @@ PyObject *args;
 }
 
 static char input_set_scroll__doc__[] =
-    "Makes the input scrollable"
+"Makes the input scrollable"
-    ;
+;
 
 static PyObject *
 input_set_scroll(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -141,13 +141,13 @@ PyObject *args;
 }
 
 static char input_set_cursorpos__doc__[] =
-    "Sets the input's cursor position"
+"Sets the input's cursor position"
-    ;
+;
 
 static PyObject *
 input_set_cursorpos(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i,j;
@@ -160,13 +160,13 @@ PyObject *args;
 }
 
 static char input_set_selected__doc__[] =
-    "Sets the input as selected"
+"Sets the input as selected"
-    ;
+;
 
 static PyObject *
 input_set_selected(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -179,13 +179,13 @@ PyObject *args;
 }
 
 static char input_set_selected_range__doc__[] =
-    "Sets a range of the input object as selected"
+"Sets a range of the input object as selected"
-    ;
+;
 
 static PyObject *
 input_set_selected_range(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i,j;
@@ -199,8 +199,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef input_methods[] =
+static struct PyMethodDef input_methods[] = {
-{
 	{"create",	input_create,	1,	input_create__doc__},
  {"set",	input_set,	1,	input_set__doc__},
  {"set_color",	input_set_color,	1,	input_set_color__doc__},
@@ -218,11 +217,10 @@ static struct PyMethodDef input_methods[] =
 /* Initialization function for the module (*must* be called initinput) */
 
 static char input_module_documentation[] = 
-    ""
+""
-    ;
+;
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "input", /* m_name */
     input_module_documentation,      /* m_doc */
@@ -232,7 +230,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_input()

Pyxform/Modules/menu.c

@@ -28,13 +28,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char menu_create__doc__[] =
-    "Creates a menu"
+"Creates a menu"
-    ;
+;
 
 static PyObject *
 menu_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int	t,x,y,w,h;
 	char	*l;
@@ -47,13 +47,13 @@ PyObject *args;
 }
 
 static char menu_clear__doc__[] =
-    "Removes all the menu's options"
+"Removes all the menu's options"
-    ;
+;
 
 static PyObject *
 menu_clear(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 
@@ -65,13 +65,13 @@ PyObject *args;
 }
 
 static char menu_set__doc__[] =
-    "Sets the menu contents"
+"Sets the menu contents"
-    ;
+;
 
 static PyObject *
 menu_set(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	*s;
@@ -84,13 +84,13 @@ PyObject *args;
 }
 
 static char menu_addto__doc__[] =
-    "Adds an option to an existing menu"
+"Adds an option to an existing menu"
-    ;
+;
 
 static PyObject *
 menu_addto(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	*s;
@@ -103,13 +103,13 @@ PyObject *args;
 }
 
 static char menu_replace_item__doc__[] =
-    "Replaces an item from the menu"
+"Replaces an item from the menu"
-    ;
+;
 
 static PyObject *
 menu_replace_item(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -123,13 +123,13 @@ PyObject *args;
 }
 
 static char menu_delete_item__doc__[] =
-    "Deletes an option from a menu"
+"Deletes an option from a menu"
-    ;
+;
 
 static PyObject *
 menu_delete_item(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -142,13 +142,13 @@ PyObject *args;
 }
 
 static char menu_set_item_shortcut__doc__[] =
-    "Sets a menu item's shortcut"
+"Sets a menu item's shortcut"
-    ;
+;
 
 static PyObject *
 menu_set_item_shortcut(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -162,13 +162,13 @@ PyObject *args;
 }
 
 static char menu_set_item_mode__doc__[] =
-    "Sets the item mode (unselectable, etc)"
+"Sets the item mode (unselectable, etc)"
-    ;
+;
 
 static PyObject *
 menu_set_item_mode(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long		o;
 	int		i;
@@ -182,13 +182,13 @@ PyObject *args;
 }
 
 static char menu_show_symbol__doc__[] =
-    "Shows a simbol menu with the label"
+"Shows a simbol menu with the label"
-    ;
+;
 
 static PyObject *
 menu_show_symbol(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -201,13 +201,13 @@ PyObject *args;
 }
 
 static char menu_get__doc__[] =
-    "Gets the last selected item's number"
+"Gets the last selected item's number"
-    ;
+;
 
 static PyObject *
 menu_get(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	r;
@@ -219,13 +219,13 @@ PyObject *args;
 }
 
 static char menu_get_maxitems__doc__[] =
-    "returns the number of items in a menu"
+"returns the number of items in a menu"
-    ;
+;
 
 static PyObject *
 menu_get_maxitems(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	r;
@@ -237,13 +237,13 @@ PyObject *args;
 }
 
 static char menu_get_text__doc__[] =
-    "Returns the text of the menu last selected choice"
+"Returns the text of the menu last selected choice"
-    ;
+;
 
 static PyObject *
 menu_get_text(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	s[2048];
@@ -256,8 +256,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef menu_methods[] =
+static struct PyMethodDef menu_methods[] = {
-{
 	{"create",	menu_create,	1,	menu_create__doc__},
  {"clear",	menu_clear,	1,	menu_clear__doc__},
  {"set",	menu_set,	1,	menu_set__doc__},
@@ -278,11 +277,10 @@ static struct PyMethodDef menu_methods[] =
 /* Initialization function for the module (*must* be called initmenu) */
 
 static char menu_module_documentation[] = 
-    ""
+""
-    ;
+;
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "menu", /* m_name */
     menu_module_documentation,      /* m_doc */
@@ -292,7 +290,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_menu()

Pyxform/Modules/objects.c

@@ -5,13 +5,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char obj_set_boxtype__doc__[] =
-    "Sets the objects Boxtype"
+"Sets the objects Boxtype"
-    ;
+;
 
 static PyObject *
 obj_set_boxtype(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long 	object;
 	int	type;
@@ -24,13 +24,13 @@ PyObject *args;
 }
 
 static char obj_set_bw__doc__[] =
-    "Sets the object's Border Width"
+"Sets the object's Border Width"
-    ;
+;
 
 static PyObject *
 obj_set_bw(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	object;
 	int	bw;
@@ -43,13 +43,13 @@ PyObject *args;
 }
 
 static char obj_set_resize__doc__[] =
-    "Sets the objects \"Resize policy\""
+"Sets the objects \"Resize policy\""
-    ;
+;
 
 static PyObject *
 obj_set_resize(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long            object;
 	unsigned        a;
@@ -63,13 +63,13 @@ PyObject *args;
 
 
 static char obj_set_gravity__doc__[] =
-    "Sets the objects gravity"
+"Sets the objects gravity"
-    ;
+;
 
 static PyObject *
 obj_set_gravity(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long            object;
 	unsigned        a,b,c;
@@ -83,13 +83,13 @@ PyObject *args;
 
 
 static char obj_set_lsize__doc__[] =
-    "Sets the object's label size"
+"Sets the object's label size"
-    ;
+;
 
 static PyObject *
 obj_set_lsize(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    object;
 	int     size;
@@ -102,13 +102,13 @@ PyObject *args;
 }
 
 static char obj_set_lstyle__doc__[] =
-    "Sets the object's label style"
+"Sets the object's label style"
-    ;
+;
 
 static PyObject *
 obj_set_lstyle(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    object;
 	int     style;
@@ -121,13 +121,13 @@ PyObject *args;
 }
 
 static char obj_set_lcol__doc__[] =
-    "Sets the object's label color"
+"Sets the object's label color"
-    ;
+;
 
 static PyObject *
 obj_set_lcol(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long 	o;
 	int	c;
@@ -139,13 +139,13 @@ PyObject *args;
 }
 
 static char obj_set_dragndrop__doc__[] =
-    "XXXXXXNot implemented"
+"XXXXXXNot implemented"
-    ;
+;
 
 static PyObject *
 obj_set_dragndrop(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -155,13 +155,13 @@ PyObject *args;
 }
 
 static char obj_set_focus__doc__[] =
-    "XXXXXXNot implemented"
+"XXXXXXNot implemented"
-    ;
+;
 
 static PyObject *
 obj_set_focus(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -171,13 +171,13 @@ PyObject *args;
 }
 
 static char obj_redraw__doc__[] =
-    "Redraws the object"
+"Redraws the object"
-    ;
+;
 
 static PyObject *
 obj_redraw(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 
@@ -189,13 +189,13 @@ PyObject *args;
 }
 
 static char obj_set_lalign__doc__[] =
-    "Sets the label alignment"
+"Sets the label alignment"
-    ;
+;
 
 static PyObject *
 obj_set_lalign(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	a;
@@ -208,13 +208,13 @@ PyObject *args;
 
 
 static char obj_set_callback__doc__[] =
-    "XXXXXXNot implemented"
+"XXXXXXNot implemented"
-    ;
+;
 
 static PyObject *
 obj_set_callback(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -224,13 +224,13 @@ PyObject *args;
 }
 
 static char obj_show__doc__[] =
-    "Shows the object"
+"Shows the object"
-    ;
+;
 
 static PyObject *
 obj_show(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 
@@ -242,13 +242,13 @@ PyObject *args;
 }
 
 static char obj_hide__doc__[] =
-    "Hides the object"
+"Hides the object"
-    ;
+;
 
 static PyObject *
 obj_hide(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	if (!PyArg_ParseTuple(args, "l",&o))
@@ -259,13 +259,13 @@ PyObject *args;
 }
 
 static char obj_free__doc__[] =
-    "Releases the object's memory"
+"Releases the object's memory"
-    ;
+;
 
 static PyObject *
 obj_free(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	if (!PyArg_ParseTuple(args, "l",&o))
@@ -276,13 +276,13 @@ PyObject *args;
 }
 
 static char obj_delete__doc__[] =
-    "Deletes the object from it's form"
+"Deletes the object from it's form"
-    ;
+;
 
 static PyObject *
 obj_delete(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	if (!PyArg_ParseTuple(args, "l",&o))
@@ -293,13 +293,13 @@ PyObject *args;
 }
 
 static char obj_set_color__doc__[] =
-    "Sets the object color"
+"Sets the object color"
-    ;
+;
 
 static PyObject *
 obj_set_color(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	float	a,b;
@@ -311,13 +311,13 @@ PyObject *args;
 }
 
 static char obj_set_label__doc__[] =
-    "Sets the label"
+"Sets the label"
-    ;
+;
 
 static PyObject *
 obj_set_label(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	*s;
@@ -330,13 +330,13 @@ PyObject *args;
 }
 
 static char obj_activate__doc__[] =
-    "Activates the object"
+"Activates the object"
-    ;
+;
 
 static PyObject *
 obj_activate(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 
@@ -349,13 +349,13 @@ PyObject *args;
 
 
 static char obj_deactivate__doc__[] =
-    "Activates the object"
+"Activates the object"
-    ;
+;
 
 static PyObject *
 obj_deactivate(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 
@@ -367,13 +367,13 @@ PyObject *args;
 }
 
 static char obj_set_shortcut__doc__[] =
-    "Sets the shortcut to the object"
+"Sets the shortcut to the object"
-    ;
+;
 
 static PyObject *
 obj_set_shortcut(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	char	*s;
@@ -387,13 +387,13 @@ PyObject *args;
 }
 
 static char obj_set_dblbuffer__doc__[] =
-    "Sets the object as double buffered"
+"Sets the object as double buffered"
-    ;
+;
 
 static PyObject *
 obj_set_dblbuffer(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	c;
@@ -407,13 +407,13 @@ PyObject *args;
 
 
 static char obj_set_geometry__doc__[] =
-    "Sets the object's geometry"
+"Sets the object's geometry"
-    ;
+;
 
 static PyObject *
 obj_set_geometry(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	x,y,w,h;
@@ -429,13 +429,13 @@ PyObject *args;
 
 
 static char obj_get_geometry__doc__[] =
-    "Sets the object's geometry"
+"Sets the object's geometry"
-    ;
+;
 
 static PyObject *
 obj_get_geometry(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	x,y,w,h;
@@ -452,8 +452,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef obj_methods[] =
+static struct PyMethodDef obj_methods[] = {
-{
 	{"set_boxtype",	obj_set_boxtype,	1,	obj_set_boxtype__doc__},
  {"set_bw",	obj_set_bw,	1,	obj_set_bw__doc__},
  {"set_resize",	obj_set_resize,	1,	obj_set_resize__doc__},
@@ -486,10 +485,9 @@ static struct PyMethodDef obj_methods[] =
 /* Initialization function for the module (*must* be called initobjects) */
 
 static char objects_module_documentation[] = 
-    ""
+""
-    ;
+;
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "objects", /* m_name */
     objects_module_documentation,      /* m_doc */
@@ -499,7 +497,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_objects()

Pyxform/Modules/pixmaps.c

@@ -28,13 +28,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char pmp_create__doc__[] =
-    "Creates a pixmap"
+"Creates a pixmap"
-    ;
+;
 
 static PyObject *
 pmp_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int		t,x,y,w,h;
 	char		*l;
@@ -47,13 +47,13 @@ PyObject *args;
 }
 
 static char pmp_set_data__doc__[] =
-    "Sets the pixmap's data"
+"Sets the pixmap's data"
-    ;
+;
 
 static PyObject *
 pmp_set_data(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    o;
 	long    b;
@@ -68,13 +68,13 @@ PyObject *args;
 
 
 static char pmp_set_file__doc__[] =
-    "Loads a file into a pixmap"
+"Loads a file into a pixmap"
-    ;
+;
 
 static PyObject *
 pmp_set_file(self, args)
-PyObject *self; /* Not used */
+	PyObject *self; /* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    o;
 	char    *f;
@@ -89,8 +89,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef pmp_methods[] =
+static struct PyMethodDef pmp_methods[] = {
-{
  {"create",	pmp_create,	1,	pmp_create__doc__},
  {"set_data",	pmp_set_data,	1,	pmp_set_data__doc__},
  {"set_file",	pmp_set_file,	1,	pmp_set_file__doc__},
@@ -102,11 +101,10 @@ static struct PyMethodDef pmp_methods[] =
 /* Initialization function for the module (*must* be called initpixmap) */
 
 static char pixmaps_module_documentation[] = 
-    ""
+""
-    ;
+;
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "pixmaps", /* m_name */
     pixmaps_module_documentation,      /* m_doc */
@@ -116,7 +114,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_pixmaps()

Pyxform/Modules/popups.c

@@ -29,13 +29,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char pup_new__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_new(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -45,13 +45,13 @@ PyObject *args;
 }
 
 static char pup_def__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_def(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -61,13 +61,13 @@ PyObject *args;
 }
 
 static char pup_addto__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_addto(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -77,13 +77,13 @@ PyObject *args;
 }
 
 static char pup_set__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -93,13 +93,13 @@ PyObject *args;
 }
 
 static char pup_free__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_free(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -109,13 +109,13 @@ PyObject *args;
 }
 
 static char pup_do__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_do(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -125,13 +125,13 @@ PyObject *args;
 }
 
 static char pup_set_shortcut__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_shortcut(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -141,13 +141,13 @@ PyObject *args;
 }
 
 static char pup_set_position__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_position(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -157,13 +157,13 @@ PyObject *args;
 }
 
 static char pup_set_selection__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_selection(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -173,13 +173,13 @@ PyObject *args;
 }
 
 static char pup_set_fontsize__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_fontsize(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -189,13 +189,13 @@ PyObject *args;
 }
 
 static char pup_set_fontstyle__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_fontstyle(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -205,13 +205,13 @@ PyObject *args;
 }
 
 static char pup_set_shadow__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_shadow(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -221,13 +221,13 @@ PyObject *args;
 }
 
 static char pup_set_softedge__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_softedge(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -237,13 +237,13 @@ PyObject *args;
 }
 
 static char pup_set_color__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_color(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -253,13 +253,13 @@ PyObject *args;
 }
 
 static char pup_set_title__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_title(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -269,13 +269,13 @@ PyObject *args;
 }
 
 static char pup_set_itemcb__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_itemcb(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -285,13 +285,13 @@ PyObject *args;
 }
 
 static char pup_set_menucb__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_menucb(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -301,13 +301,13 @@ PyObject *args;
 }
 
 static char pup_set_submenu__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 pup_set_submenu(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -318,8 +318,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef pup_methods[] =
+static struct PyMethodDef pup_methods[] = {
-{
 	{"new",	pup_new,	1,	pup_new__doc__},
  {"def",	pup_def,	1,	pup_def__doc__},
  {"addto",	pup_addto,	1,	pup_addto__doc__},
@@ -346,10 +345,9 @@ static struct PyMethodDef pup_methods[] =
 /* Initialization function for the module (*must* be called initpopups) */
 
 static char popups_module_documentation[] = 
-    ""
+""
-    ;
+;
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "popups", /* m_name */
     popups_module_documentation,      /* m_doc */
@@ -359,7 +357,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_popups()

Pyxform/Modules/positioner.c

@@ -28,13 +28,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char posit_create__doc__[] =
-    "Creates a positioner"
+"Creates a positioner"
-    ;
+;
 
 static PyObject *
 posit_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    o;
 	int     t,x,y,w,h;
@@ -47,13 +47,13 @@ PyObject *args;
 }
 
 static char posit_set_xvalue__doc__[] =
-    "Sets the x-value of the positioner"
+"Sets the x-value of the positioner"
-    ;
+;
 
 static PyObject *
 posit_set_xvalue(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	v;
@@ -66,13 +66,13 @@ PyObject *args;
 }
 
 static char posit_get_xvalue__doc__[] =
-    "Gets the x-value of the positioner"
+"Gets the x-value of the positioner"
-    ;
+;
 
 static PyObject *
 posit_get_xvalue(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	r;
@@ -84,13 +84,13 @@ PyObject *args;
 }
 
 static char posit_set_xbounds__doc__[] =
-    "Sets the positioner's x min/max"
+"Sets the positioner's x min/max"
-    ;
+;
 
 static PyObject *
 posit_set_xbounds(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double 	min,max;
@@ -103,13 +103,13 @@ PyObject *args;
 }
 
 static char posit_get_xbounds__doc__[] =
-    "Gets the positioner's x min/max"
+"Gets the positioner's x min/max"
-    ;
+;
 
 static PyObject *
 posit_get_xbounds(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double 	min,max;
@@ -122,13 +122,13 @@ PyObject *args;
 
 
 static char posit_set_yvalue__doc__[] =
-    "Sets the y-value of the positioner"
+"Sets the y-value of the positioner"
-    ;
+;
 
 static PyObject *
 posit_set_yvalue(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	v;
@@ -141,13 +141,13 @@ PyObject *args;
 }
 
 static char posit_get_yvalue__doc__[] =
-    "Gets the y-value of the positioner"
+"Gets the y-value of the positioner"
-    ;
+;
 
 static PyObject *
 posit_get_yvalue(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	r;
@@ -159,13 +159,13 @@ PyObject *args;
 }
 
 static char posit_set_ybounds__doc__[] =
-    "Sets the positioner's y min/max"
+"Sets the positioner's y min/max"
-    ;
+;
 
 static PyObject *
 posit_set_ybounds(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double 	min,max;
@@ -178,13 +178,13 @@ PyObject *args;
 }
 
 static char posit_get_ybounds__doc__[] =
-    "Gets the positioner's y min/max"
+"Gets the positioner's y min/max"
-    ;
+;
 
 static PyObject *
 posit_get_ybounds(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double 	min,max;
@@ -197,13 +197,13 @@ PyObject *args;
 
 
 static char posit_set_xstep__doc__[] =
-    "Sets the positioner x-step"
+"Sets the positioner x-step"
-    ;
+;
 
 static PyObject *
 posit_set_xstep(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	s;
@@ -217,13 +217,13 @@ PyObject *args;
 
 
 static char posit_set_ystep__doc__[] =
-    "Sets the positioner y-step"
+"Sets the positioner y-step"
-    ;
+;
 
 static PyObject *
 posit_set_ystep(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	s;
@@ -236,13 +236,13 @@ PyObject *args;
 }
 
 static char posit_set_return__doc__[] =
-    "Makes the positioner return always or when released"
+"Makes the positioner return always or when released"
-    ;
+;
 
 static PyObject *
 posit_set_return(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -256,8 +256,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef posit_methods[] =
+static struct PyMethodDef posit_methods[] = {
-{
 	{"create",	posit_create,	1,	posit_create__doc__},
  {"set_xvalue",	posit_set_xvalue,	1,	posit_set_xvalue__doc__},
  {"get_xvalue",	posit_get_xvalue,	1,	posit_get_xvalue__doc__},
@@ -278,10 +277,9 @@ static struct PyMethodDef posit_methods[] =
 /* Initialization function for the module (*must* be called initpositioner) */
 
 static char positioner_module_documentation[] = 
-    ""
+""
-    ;
+;
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "positioner", /* m_name */
     positioner_module_documentation,      /* m_doc */
@@ -291,7 +289,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_positioner()

Pyxform/Modules/slider.c

@@ -29,13 +29,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char slider_create__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 slider_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int	t,x,y,w,h;
 	char	*l;
@@ -48,13 +48,13 @@ PyObject *args;
 }
 
 static char slider_create_val__doc__[] =
-    "Creates a val_slider"
+"Creates a val_slider"
-    ;
+;
 
 static PyObject *
 slider_create_val(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	int	t,x,y,w,h;
 	char	*l;
@@ -67,14 +67,14 @@ PyObject *args;
 }
 
 static char slider_set_value__doc__[] =
-    "Sets the slider's value"
+"Sets the slider's value"
-    ;
+;
 
 
 static PyObject *
 slider_set_value(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	v;
@@ -87,13 +87,13 @@ PyObject *args;
 }
 
 static char slider_get_value__doc__[] =
-    "Gets the slider value"
+"Gets the slider value"
-    ;
+;
 
 static PyObject *
 slider_get_value(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	v;
@@ -105,13 +105,13 @@ PyObject *args;
 }
 
 static char slider_set_bounds__doc__[] =
-    "Sets the slider's min/max"
+"Sets the slider's min/max"
-    ;
+;
 
 static PyObject *
 slider_set_bounds(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	min,max;
@@ -124,13 +124,13 @@ PyObject *args;
 }
 
 static char slider_get_bounds__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 slider_get_bounds(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	min,max;
@@ -142,13 +142,13 @@ PyObject *args;
 }
 
 static char slider_set_return__doc__[] =
-    "Makes the slider return always or when released"
+"Makes the slider return always or when released"
-    ;
+;
 
 static PyObject *
 slider_set_return(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -161,13 +161,13 @@ PyObject *args;
 }
 
 static char slider_set_step__doc__[] =
-    "Sets the slider's step"
+"Sets the slider's step"
-    ;
+;
 
 static PyObject *
 slider_set_step(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	s;
@@ -180,13 +180,13 @@ PyObject *args;
 }
 
 static char slider_set_size__doc__[] =
-    "Sets the slider's thingy size"
+"Sets the slider's thingy size"
-    ;
+;
 
 static PyObject *
 slider_set_size(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	s;
@@ -199,13 +199,13 @@ PyObject *args;
 }
 
 static char slider_set_precision__doc__[] =
-    "Sets the valslider's precision"
+"Sets the valslider's precision"
-    ;
+;
 
 static PyObject *
 slider_set_precision(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	int	i;
@@ -219,8 +219,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef slider_methods[] =
+static struct PyMethodDef slider_methods[] = {
-{
 	{"create",	slider_create,	1,	slider_create__doc__},
  {"create_val",	slider_create_val,	1,	slider_create_val__doc__},
  {"set_value",	slider_set_value,	1,	slider_set_value__doc__},
@@ -239,10 +238,9 @@ static struct PyMethodDef slider_methods[] =
 /* Initialization function for the module (*must* be called initslider) */
 
 static char slider_module_documentation[] = 
-    ""
+""
-    ;
+;
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "slider", /* m_name */
     slider_module_documentation,      /* m_doc */
@@ -252,7 +250,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_slider()

Pyxform/Modules/text.c

@@ -29,13 +29,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char text_create__doc__[] =
-    ""
+""
-    ;
+;
 
 static PyObject *
 text_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 
 	if (!PyArg_ParseTuple(args, ""))
@@ -46,8 +46,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef text_methods[] =
+static struct PyMethodDef text_methods[] = {
-{
 	{"create",	text_create,	1,	text_create__doc__},
  
 	{NULL,		NULL}		/* sentinel */
@@ -57,11 +56,10 @@ static struct PyMethodDef text_methods[] =
 /* Initialization function for the module (*must* be called inittext) */
 
 static char text_module_documentation[] = 
-    ""
+""
-    ;
+;
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "text", /* m_name */
     text_module_documentation,      /* m_doc */
@@ -71,7 +69,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_text()

Pyxform/Modules/timer.c

@@ -28,13 +28,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char timer_create__doc__[] =
-    "Creates a timer"
+"Creates a timer"
-    ;
+;
 
 static PyObject *
 fl_timer_create(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long    o;
 	int     t,x,y,w,h;
@@ -47,13 +47,13 @@ PyObject *args;
 }
 
 static char timer_set__doc__[] =
-    "Set the time remaining in a timer object"
+"Set the time remaining in a timer object"
-    ;
+;
 
 static PyObject *
 timer_set(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	v;
@@ -66,13 +66,13 @@ PyObject *args;
 }
 
 static char timer_get__doc__[] =
-    "Get the time remaining in a timer object"
+"Get the time remaining in a timer object"
-    ;
+;
 
 static PyObject *
 timer_get(self, args)
-PyObject *self;	/* Not used */
+	PyObject *self;	/* Not used */
-PyObject *args;
+	PyObject *args;
 {
 	long	o;
 	double	v;
@@ -85,8 +85,7 @@ PyObject *args;
 
 /* List of methods defined in the module */
 
-static struct PyMethodDef timer_methods[] =
+static struct PyMethodDef timer_methods[] = {
-{
 	{"create",	fl_timer_create,	1,	timer_create__doc__},
  {"set",	timer_set,	1,	timer_set__doc__},
  {"get",	timer_get,	1,	timer_get__doc__},
@@ -98,11 +97,10 @@ static struct PyMethodDef timer_methods[] =
 /* Initialization function for the module (*must* be called inittimer) */
 
 static char timer_module_documentation[] = 
-    ""
+""
-    ;
+;
 
-static struct PyModuleDef moduledef =
+  static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "timer", /* m_name */
     timer_module_documentation,      /* m_doc */
@@ -112,7 +110,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_timer()

Pyxform/Modules/xforms.c

@@ -25,8 +25,8 @@ Returns:
 
 static PyObject *
 pyxforms_init(self,args)
-PyObject *self;
+	PyObject *self;
-PyObject *args;
+	PyObject *args;
 {
 	int sts;
 	char *appname;
@@ -50,27 +50,25 @@ Returns: NULL on error
 
 static PyObject *
 pyxforms_do_forms(self,args)
-PyObject *self;
+	PyObject *self;
-PyObject *args;
+	PyObject *args;
 {
 	FL_OBJECT *obj;
 	obj=fl_do_only_forms (); /* XXXXX not do_forms, until EVENTS get done */
 	return Py_BuildValue("l",(long)obj);
 }
 
-static PyMethodDef xformsMethods [] =
+static PyMethodDef xformsMethods [] ={
-{
 	
-    /* XForms specifics */
+/* XForms specifics */
 	{"init",pyxforms_init,1},
 	{"do_forms",pyxforms_do_forms,1},
-    /* FENCE */
+/* FENCE */
 	{NULL,NULL}
 };
 
 
-static struct PyModuleDef moduledef =
+    static struct PyModuleDef moduledef = {
-{
         PyModuleDef_HEAD_INIT,
         "xforms",     /* m_name */
         "",  /* m_doc */
@@ -80,11 +78,11 @@ static struct PyModuleDef moduledef =
         NULL,                /* m_traverse */
         NULL,                /* m_clear */
         NULL,                /* m_free */
-};
+    };
 
 PyMODINIT_FUNC
 PyInit_xforms()
 {
-    PyModule_Create(&moduledef);
+PyModule_Create(&moduledef);	
 }
 

Pyxform/Modules/xyplot.c

@@ -28,13 +28,13 @@ static PyObject *ErrorObject;
 /* ----------------------------------------------------- */
 
 static char xyplot_set_return__doc__[] =
-    "Makes the XyPlot return always or when released"
+"Makes the XyPlot return always or when released"
  ;
 
 static PyObject *
 xyplot_set_return (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
   long o;
   int i;
@@ -47,13 +47,13 @@ PyObject *args;
 }
 
 static char xyplot_set_xtics__doc__[] =
-    "Changes the number of xtics (major and minor) in a xyplot"
+"Changes the number of xtics (major and minor) in a xyplot"
  ;
 
 static PyObject *
 xyplot_set_xtics (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
   long o;
   int i, j;
@@ -66,13 +66,13 @@ PyObject *args;
 }
 
 static char xyplot_set_ytics__doc__[] =
-    "Changes the number of ytics (major and minor) in a xyplot"
+"Changes the number of ytics (major and minor) in a xyplot"
  ;
 
 static PyObject *
 xyplot_set_ytics (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
   long o;
   int i, j;
@@ -85,13 +85,13 @@ PyObject *args;
 }
 
 static char xyplot_set_xbounds__doc__[] =
-    "Sets the xmin and xmax in a xyplot"
+"Sets the xmin and xmax in a xyplot"
  ;
 
 static PyObject *
 xyplot_set_xbounds (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
   long o;
   double u, v;
@@ -104,13 +104,13 @@ PyObject *args;
 }
 
 static char xyplot_set_ybounds__doc__[] =
-    "Sets the xmin and xmax in a xyplot"
+"Sets the xmin and xmax in a xyplot"
  ;
 
 static PyObject *
 xyplot_set_ybounds (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
   long o;
   double u, v;
@@ -123,13 +123,13 @@ PyObject *args;
 }
 
 static char xyplot_get__doc__[] =
-    "Gets the current value of the point that changed"
+"Gets the current value of the point that changed"
  ;
 
 static PyObject *
 xyplot_get (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
   long o;
   float x, y;
@@ -143,13 +143,13 @@ PyObject *args;
 }
 
 static char xyplot_get_data__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_get_data (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -159,13 +159,13 @@ PyObject *args;
 }
 
 static char xyplot_create__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_create (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -175,13 +175,13 @@ PyObject *args;
 }
 
 static char xyplot_set_data__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_set_data (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -191,13 +191,13 @@ PyObject *args;
 }
 
 static char xyplot_set_file__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_set_file (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -207,13 +207,13 @@ PyObject *args;
 }
 
 static char xyplot_add_text__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_add_text (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -223,13 +223,13 @@ PyObject *args;
 }
 
 static char xyplot_delete_text__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_delete_text (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -239,13 +239,13 @@ PyObject *args;
 }
 
 static char xyplot_add_overlay__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_add_overlay (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -255,13 +255,13 @@ PyObject *args;
 }
 
 static char xyplot_set_overlay_type__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_set_overlay_type (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -271,13 +271,13 @@ PyObject *args;
 }
 
 static char xyplot_delete_overlay__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_delete_overlay (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -287,13 +287,13 @@ PyObject *args;
 }
 
 static char xyplot_set_interpolate__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_set_interpolate (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -303,13 +303,13 @@ PyObject *args;
 }
 
 static char xyplot_set_fontsize__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_set_fontsize (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -319,13 +319,13 @@ PyObject *args;
 }
 
 static char xyplot_set_fontstyle__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_set_fontstyle (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -335,13 +335,13 @@ PyObject *args;
 }
 
 static char xyplot_set_inspect__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_set_inspect (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -351,13 +351,13 @@ PyObject *args;
 }
 
 static char xyplot_set_symbolsize__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_set_symbolsize (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -367,13 +367,13 @@ PyObject *args;
 }
 
 static char xyplot_replace_point__doc__[] =
-    ""
+""
  ;
 
 static PyObject *
 xyplot_replace_point (self, args)
-PyObject *self;		/* Not used */
+     PyObject *self;		/* Not used */
-PyObject *args;
+     PyObject *args;
 {
 
   if (!PyArg_ParseTuple (args, ""))
@@ -415,10 +415,9 @@ static struct PyMethodDef xyplot_methods[] =
 /* Initialization function for the module (*must* be called initxyplot) */
 
 static char xyplot_module_documentation[] =
-    ""
+""
  ;
-static struct PyModuleDef moduledef =
+   static struct PyModuleDef moduledef = {
-{
     PyModuleDef_HEAD_INIT,
     "xyplot", /* m_name */
     xyplot_module_documentation,      /* m_doc */
@@ -428,7 +427,7 @@ static struct PyModuleDef moduledef =
     NULL,                /* m_traverse */
     NULL,                /* m_clear */
     NULL,                /* m_free */
-};
+  };
 
 PyMODINIT_FUNC
 PyInit_xyplot ()

samples/demo1.py

@@ -5,12 +5,12 @@ from Pyxform import *
 # Init the library (sucks but works)
 #
 
-xfinit("Something", "1", sys.argv[0])
+xfinit ('Something','1',sys.argv[0])
 
 #
 # Create a "Window" - A form in XForms parlance
 
-win = Form()
+win=Form()
 
 #
 # Show it
@@ -20,12 +20,12 @@ win.Show()
 #
 # Create a button
 
-a_button = Button(0, 10, 10, 100, 30, "Press Me")
+a_button=Button(0,10,10,100,30,"Press Me")
 
 #
 # Put it inside win
 
-win.Add(a_button)
+win.Add (a_button)
 
 #
 # Start the event loop

samples/demo2.py

@@ -7,12 +7,12 @@ from goodies import *
 # Init the library (sucks but works)
 #
 
-xfinit("Something", "1", sys.argv[0])
+xfinit ('Something','1',sys.argv[0])
 
 #
 # Create a "Window" - A form in XForms parlance
 
-win = Form()
+win=Form()
 
 #
 # Show it
@@ -22,28 +22,26 @@ win.Show()
 #
 # Create a button
 
-a_button = Button(0, 10, 10, 100, 30, "Press Me")
+a_button=Button(0,10,10,100,30,"Press Me")
 
 #
 # Put it inside win
 
-win.Add(a_button)
+win.Add (a_button)
 
 #
 # Define a function, that will be executed when the button is pressed
 
-
+def funct (self):
-def funct(self):
 	# It shows a message and exits (or not)
-    answer = show_question("Do you want", "to exit?", "")
+	answer=show_question ("Do you want","to exit?","")
-    if answer == 1:
+	if answer==1:
 		sys.exit()
 
-
 #
 # And bind the function to the button
 
-a_button.cb = funct
+a_button.cb=funct
 
 
 #

samples/demo3.py

@@ -7,12 +7,12 @@ from goodies import *
 # Init the library (sucks but works)
 #
 
-xfinit("Something", "1", sys.argv[0])
+xfinit ('Something','1',sys.argv[0])
 
 #
 # Create a "Window" - A form in XForms parlance
 
-win = Form()
+win=Form()
 
 #
 # Show it
@@ -22,52 +22,50 @@ win.Show()
 #
 # Create a button, and 2 sliders
 
-a_button = Button(0, 10, 10, 100, 30, "Press Me")
+a_button=Button(0,10,10,100,30,"Press Me")
-h_slider = Slider(5, 0, 180, 200, 20, "")
+h_slider=Slider(5,0,180,200,20,"")
-v_slider = Slider(4, 180, 0, 20, 180, "")
+v_slider=Slider(4,180,0,20,180,"")
 
 #
 # Set some values for the sliders
 
-h_slider.Setbounds(0, 200)
+h_slider.Setbounds(0,200)
 h_slider.Set(0)
 
-v_slider.Setbounds(0, 200)
+v_slider.Setbounds(0,200)
 v_slider.Set(0)
 
 #
 # Put them inside win
 
-win.Add(a_button)
+win.Add (a_button)
-win.Add(h_slider)
+win.Add (h_slider)
-win.Add(v_slider)
+win.Add (v_slider)
 
 #
 # Define a function, that will be executed when the button is pressed
 
-
+def funct (self):
-def funct(self):
 	# It shows a message and exits (or not)
-    answer = show_question("Do you want", "to exit?", "")
+	answer=show_question ("Do you want","to exit?","")
-    if answer == 1:
+	if answer==1:
 		sys.exit()
 
-
 #
 # And another one, for when the sliders move
 
-
+def slide (self):
-def slide(self):
 	# It moves the button to the position of the sliders
-    a_button.x = h_slider.Get()
+	a_button.x=h_slider.Get()
-    a_button.y = v_slider.Get()
+	a_button.y=v_slider.Get()
+
 
 
 #
 # And bind the functions to the controls
 
-a_button.cb = funct
+a_button.cb=funct
-h_slider.cb = v_slider.cb = slide
+h_slider.cb=v_slider.cb=slide
 
 
 #

samples/demo4.py

@@ -7,12 +7,12 @@ from goodies import *
 # Init the library (sucks but works)
 #
 
-xfinit("Something", "1", sys.argv[0])
+xfinit ('Something','1',sys.argv[0])
 
 #
 # Create a "Window" - A form in XForms parlance
 
-win = Form()
+win=Form()
 
 #
 # Show it
@@ -22,54 +22,52 @@ win.Show()
 #
 # Create a button, and 2 valsliders
 
-a_button = Button(0, 10, 10, 100, 30, "Press Me")
+a_button=Button(0,10,10,100,30,"Press Me")
-h_slider = Valslider(5, 0, 180, 200, 20, "")
+h_slider=Valslider(5,0,180,200,20,"")
-v_slider = Valslider(4, 180, 0, 20, 180, "")
+v_slider=Valslider(4,180,0,20,180,"")
 
 #
 # Set some values for the sliders
 
-h_slider.Setbounds(0, 200)
+h_slider.Setbounds(0,200)
 h_slider.Set(0)
 h_slider.Setprecision(0)
 
-v_slider.Setbounds(0, 200)
+v_slider.Setbounds(0,200)
 v_slider.Set(0)
 v_slider.Setprecision(0)
 
 #
 # Put them inside win
 
-win.Add(a_button)
+win.Add (a_button)
-win.Add(h_slider)
+win.Add (h_slider)
-win.Add(v_slider)
+win.Add (v_slider)
 
 #
 # Define a function, that will be executed when the button is pressed
 
-
+def funct (self):
-def funct(self):
 	# It shows a message and exits (or not)
-    answer = show_question("Do you want", "to exit?", "")
+	answer=show_question ("Do you want","to exit?","")
-    if answer == 1:
+	if answer==1:
 		sys.exit()
 
-
 #
 # And another one, for when the sliders move
 
-
+def slide (self):
-def slide(self):
 	# It moves the button to the position of the sliders
-    a_button.x = h_slider.Get()
+	a_button.x=h_slider.Get()
-    a_button.y = v_slider.Get()
+	a_button.y=v_slider.Get()
+
 
 
 #
 # And bind the functions to the controls
 
-a_button.cb = funct
+a_button.cb=funct
-h_slider.cb = v_slider.cb = slide
+h_slider.cb=v_slider.cb=slide
 
 
 #

samples/demo5.py

@@ -7,12 +7,12 @@ from goodies import *
 # Init the library (sucks but works)
 #
 
-xfinit("Something", "1", sys.argv[0])
+xfinit ('Something','1',sys.argv[0])
 
 #
 # Create a "Window" - A form in XForms parlance
 
-win = Form(6, 640, 480)
+win=Form(6,640,480)
 
 #
 # Show it
@@ -22,40 +22,35 @@ win.Show()
 #
 # Create a browser and a Button
 
-brow = Browser(0, 10, 10, 620, 440, "Read Me")
+brow=Browser(0,10,10,620,440,"Read Me")
-but1 = Button(0, 10, 450, 100, 25, "Push Me")
+but1=Button (0,10,450,100,25,"Push Me")
-but2 = Button(0, 120, 450, 100, 25, "Exit")
+but2=Button (0,120,450,100,25,"Exit") 
 #
 # Put them inside win
 
-win.Add(brow)
+win.Add (brow)
-win.Add(but1)
+win.Add (but1)
-win.Add(but2)
+win.Add (but2)
 
 #
 # The exit function
 
-
+def funct (self):
-def funct(self):
 	# It shows a message and exits (or not)
-    answer = show_question("Do you want", "to exit?", "")
+	answer=show_question ("Do you want","to exit?","")
-    if answer == 1:
+	if answer==1:
 		sys.exit()  
-
+but2.cb=funct
-
-but2.cb = funct
 
 #
 # And the interesting function
 
-
 def browse_file(self):
 	# Asks for a file, and puts it in the browser
-    filename = show_fselector("", "", "", "")
+	filename=show_fselector("","","","")
-    brow.Load(filename)
+	brow.Load (filename)
 
-
+but1.cb=browse_file
-but1.cb = browse_file
 
 
 #

setup.py

@@ -1,167 +1,99 @@
 # -*- coding: utf-8 -*-
 from setuptools import setup, Extension
 
-bitmaps = Extension(
+bitmaps = Extension('Pyxform.bitmaps',
-    "Pyxform.bitmaps",
+                    sources = [ 'Pyxform/Modules/bitmaps.c'], 
-    sources=["Pyxform/Modules/bitmaps.c"],
+                    libraries = ['forms'],
-    libraries=["forms"],
+                    library_dirs = ['/usr/local/lib'])
-    library_dirs=["/usr/local/lib"],
+box = Extension('Pyxform.box',
-)
+                    sources = [ 'Pyxform/Modules/box.c'], 
-box = Extension(
+                    libraries = ['forms'],
-    "Pyxform.box",
+                    library_dirs = ['/usr/local/lib'])
-    sources=["Pyxform/Modules/box.c"],
+browser = Extension('Pyxform.browser',
-    libraries=["forms"],
+                    sources = [ 'Pyxform/Modules/browser.c'], 
-    library_dirs=["/usr/local/lib"],
+                    libraries = ['forms'],
-)
+                    library_dirs = ['/usr/local/lib'])
-browser = Extension(
+button = Extension('Pyxform.button',
-    "Pyxform.browser",
+                    sources = [ 'Pyxform/Modules/button.c'], 
-    sources=["Pyxform/Modules/browser.c"],
+                    libraries = ['forms'],
-    libraries=["forms"],
+                    library_dirs = ['/usr/local/lib'])
-    library_dirs=["/usr/local/lib"],
+choice = Extension('Pyxform.choice',
-)
+                    sources = [ 'Pyxform/Modules/choice.c'], 
-button = Extension(
+                    libraries = ['forms'],
-    "Pyxform.button",
+                    library_dirs = ['/usr/local/lib'])
-    sources=["Pyxform/Modules/button.c"],
+clock = Extension('Pyxform.clock',
-    libraries=["forms"],
+                    sources = [ 'Pyxform/Modules/clock.c'], 
-    library_dirs=["/usr/local/lib"],
+                    libraries = ['forms'],
-)
+                    library_dirs = ['/usr/local/lib'])
-choice = Extension(
+counter = Extension('Pyxform.counter',
-    "Pyxform.choice",
+                    sources = [ 'Pyxform/Modules/counter.c'], 
-    sources=["Pyxform/Modules/choice.c"],
+                    libraries = ['forms'],
-    libraries=["forms"],
+                    library_dirs = ['/usr/local/lib'])
-    library_dirs=["/usr/local/lib"],
+dial = Extension('Pyxform.dial',
-)
+                    sources = [ 'Pyxform/Modules/dial.c'], 
-clock = Extension(
+                    libraries = ['forms'],
-    "Pyxform.clock",
+                    library_dirs = ['/usr/local/lib'])
-    sources=["Pyxform/Modules/clock.c"],
+forms = Extension('Pyxform.forms',
-    libraries=["forms"],
+                    sources = [ 'Pyxform/Modules/forms.c'], 
-    library_dirs=["/usr/local/lib"],
+                    libraries = ['forms'],
-)
+                    library_dirs = ['/usr/local/lib'])
-counter = Extension(
+frame = Extension('Pyxform.frame',
-    "Pyxform.counter",
+                    sources = [ 'Pyxform/Modules/frame.c'], 
-    sources=["Pyxform/Modules/counter.c"],
+                    libraries = ['forms'],
-    libraries=["forms"],
+                    library_dirs = ['/usr/local/lib'])
-    library_dirs=["/usr/local/lib"],
+goodies = Extension('Pyxform.goodies',
-)
+                    sources = [ 'Pyxform/Modules/goodies.c'], 
-dial = Extension(
+                    libraries = ['forms'],
-    "Pyxform.dial",
+                    library_dirs = ['/usr/local/lib'])
-    sources=["Pyxform/Modules/dial.c"],
+input = Extension('Pyxform.input',
-    libraries=["forms"],
+                    sources = [ 'Pyxform/Modules/input.c'], 
-    library_dirs=["/usr/local/lib"],
+                    libraries = ['forms'],
-)
+                    library_dirs = ['/usr/local/lib'])
-forms = Extension(
+menu = Extension('Pyxform.menu',
-    "Pyxform.forms",
+                    sources = [ 'Pyxform/Modules/menu.c'], 
-    sources=["Pyxform/Modules/forms.c"],
+                    libraries = ['forms'],
-    libraries=["forms"],
+                    library_dirs = ['/usr/local/lib'])
-    library_dirs=["/usr/local/lib"],
+objects = Extension('Pyxform.objects',
-)
+                    sources = [ 'Pyxform/Modules/objects.c'], 
-frame = Extension(
+                    libraries = ['forms'],
-    "Pyxform.frame",
+                    library_dirs = ['/usr/local/lib'])
-    sources=["Pyxform/Modules/frame.c"],
+pixmaps = Extension('Pyxform.pixmaps',
-    libraries=["forms"],
+                    sources = [ 'Pyxform/Modules/pixmaps.c'], 
-    library_dirs=["/usr/local/lib"],
+                    libraries = ['forms'],
-)
+                    library_dirs = ['/usr/local/lib'])
-goodies = Extension(
+popups = Extension('Pyxform.popups',
-    "Pyxform.goodies",
+                    sources = [ 'Pyxform/Modules/popups.c'], 
-    sources=["Pyxform/Modules/goodies.c"],
+                    libraries = ['forms'],
-    libraries=["forms"],
+                    library_dirs = ['/usr/local/lib'])
-    library_dirs=["/usr/local/lib"],
+positioner = Extension('Pyxform.positioner',
-)
+                    sources = [ 'Pyxform/Modules/positioner.c'], 
-input = Extension(
+                    libraries = ['forms'],
-    "Pyxform.input",
+                    library_dirs = ['/usr/local/lib'])
-    sources=["Pyxform/Modules/input.c"],
+slider = Extension('Pyxform.slider',
-    libraries=["forms"],
+                    sources = [ 'Pyxform/Modules/slider.c'], 
-    library_dirs=["/usr/local/lib"],
+                    libraries = ['forms'],
-)
+                    library_dirs = ['/usr/local/lib'])
-menu = Extension(
+text = Extension('Pyxform.text',
-    "Pyxform.menu",
+                    sources = [ 'Pyxform/Modules/text.c'], 
-    sources=["Pyxform/Modules/menu.c"],
+                    libraries = ['forms'],
-    libraries=["forms"],
+                    library_dirs = ['/usr/local/lib'])
-    library_dirs=["/usr/local/lib"],
+timer = Extension('Pyxform.timer',
-)
+                    sources = [ 'Pyxform/Modules/timer.c'], 
-objects = Extension(
+                    libraries = ['forms'],
-    "Pyxform.objects",
+                    library_dirs = ['/usr/local/lib'])
-    sources=["Pyxform/Modules/objects.c"],
+xforms = Extension('Pyxform.xforms',
-    libraries=["forms"],
+                    sources = [ 'Pyxform/Modules/xforms.c'], 
-    library_dirs=["/usr/local/lib"],
+                    libraries = ['forms'],
-)
+                    library_dirs = ['/usr/local/lib'])
-pixmaps = Extension(
+xyplot = Extension('Pyxform.xyplot',
-    "Pyxform.pixmaps",
+                    sources = [ 'Pyxform/Modules/xyplot.c'], 
-    sources=["Pyxform/Modules/pixmaps.c"],
+                    libraries = ['forms'],
-    libraries=["forms"],
+                    library_dirs = ['/usr/local/lib'])
-    library_dirs=["/usr/local/lib"],
+setup (name = 'PyXForms',
-)
+       version = '0.2',
-popups = Extension(
+       description = 'This is OLD code',
-    "Pyxform.popups",
+       author = 'Roberto Alsina',
-    sources=["Pyxform/Modules/popups.c"],
+       author_email = 'ralsina@netmanagers.com.ar',
-    libraries=["forms"],
+       ext_modules = [bitmaps, box, browser, button, choice, clock, counter, dial, forms, frame, goodies, input, menu, objects, pixmaps, popups, positioner, slider, text, timer, xforms, xyplot],
-    library_dirs=["/usr/local/lib"],
+       packages = ['Pyxform']
-)
+       )
-positioner = Extension(
-    "Pyxform.positioner",
-    sources=["Pyxform/Modules/positioner.c"],
-    libraries=["forms"],
-    library_dirs=["/usr/local/lib"],
-)
-slider = Extension(
-    "Pyxform.slider",
-    sources=["Pyxform/Modules/slider.c"],
-    libraries=["forms"],
-    library_dirs=["/usr/local/lib"],
-)
-text = Extension(
-    "Pyxform.text",
-    sources=["Pyxform/Modules/text.c"],
-    libraries=["forms"],
-    library_dirs=["/usr/local/lib"],
-)
-timer = Extension(
-    "Pyxform.timer",
-    sources=["Pyxform/Modules/timer.c"],
-    libraries=["forms"],
-    library_dirs=["/usr/local/lib"],
-)
-xforms = Extension(
-    "Pyxform.xforms",
-    sources=["Pyxform/Modules/xforms.c"],
-    libraries=["forms"],
-    library_dirs=["/usr/local/lib"],
-)
-xyplot = Extension(
-    "Pyxform.xyplot",
-    sources=["Pyxform/Modules/xyplot.c"],
-    libraries=["forms"],
-    library_dirs=["/usr/local/lib"],
-)
-setup(
-    name="PyXForms",
-    version="0.2",
-    description="This is OLD code",
-    author="Roberto Alsina",
-    author_email="ralsina@netmanagers.com.ar",
-    ext_modules=[
-        bitmaps,
-        box,
-        browser,
-        button,
-        choice,
-        clock,
-        counter,
-        dial,
-        forms,
-        frame,
-        goodies,
-        input,
-        menu,
-        objects,
-        pixmaps,
-        popups,
-        positioner,
-        slider,
-        text,
-        timer,
-        xforms,
-        xyplot,
-    ],
-    packages=["Pyxform"],
-)