BPython: cleaning some bug tracker entries:

(excuse me for doing all in a single commit, but they are tiny
fixes and it's bpython, that dark corner ...)

#1025 - FileSelector SEGV on dynamic callback Category:

  Can't reproduce with current cvs, I'd say recent changes to fix
another crash related to FileSelector in gui-less scripts solved this
one, too.

#1028 - Reserved button event number:

  Menu choices generate two events, one extra related to the menu
itself, with value=4.  Made bpython ignore this extra event.

#1068 - FileSelector No file extension support:

  As Ton wrote there, Blender itself doesn't support this yet.  But the
requester also wanted Window.File/ImageSelector to accept a pathname.  Done.  Also updated doc.

#959 - Segfault on background rendering:

  This happened in bg mode (blender -b filename -a, for example) when
a script with the line "Blender.Redraw()" was linked to FRAMECHANGED events.  As reported in the bug page, it was because curarea is NULL in bg mode.  Made Redraw() check for this and not call functions that expected curarea in Redraw, like one to swap buffers.

#1072 - Blender.Redraw() Segfault:

  Good catch : ). Scripts called from the scripts win that called
Blender.Redraw() or Blender.Window.Redraw() would crash Blender because of a dirty pointer in Spacescript->script.  Fixed.

1 files changed, 2 insertions, 122 deletions

diff --git a/source/blender/python/api2_2x/Window.h b/source/blender/python/api2_2x/Window.h
index 800254b47df..81b288f395f 100644
--- a/source/blender/python/api2_2x/Window.h
+++ b/source/blender/python/api2_2x/Window.h
@@ -29,129 +29,9 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
 */
 
+/* This file is useless now, CAN BE REMOVED. */
+
 #ifndef EXPP_WINDOW_H
 #define EXPP_WINDOW_H
 
-#include <Python.h>
-#include <stdio.h>
-
-#include <BKE_global.h>
-#include <BKE_object.h> /* for during_script() */
-#include <BIF_usiblender.h>
-#include <BIF_mywindow.h>
-#include <BSE_headerbuttons.h>
-#include <BSE_filesel.h>
-#include <BIF_screen.h>
-#include <BIF_space.h>
-#include <BIF_drawtext.h>
-#include <mydevice.h>
-#include <DNA_view3d_types.h>
-#include <DNA_screen_types.h>
-#include <DNA_space_types.h>
-#include <DNA_text_types.h>
-
-#include "gen_utils.h"
-#include "modules.h"
-#include "matrix.h"
-
-/* Used in Draw.c */
-extern int EXPP_disable_force_draw;
-
-/* Callback used by the file and image selector access functions */
-static PyObject *(*EXPP_FS_PyCallback)(PyObject *arg) = NULL;
-
-/*****************************************************************************/
-/* Python API function prototypes for the Window module.                     */
-/*****************************************************************************/
-PyObject *M_Window_Redraw (PyObject *self, PyObject *args);
-static PyObject *M_Window_RedrawAll (PyObject *self, PyObject *args);
-static PyObject *M_Window_QRedrawAll (PyObject *self, PyObject *args);
-static PyObject *M_Window_FileSelector (PyObject *self, PyObject *args);
-static PyObject *M_Window_ImageSelector (PyObject *self, PyObject *args);
-static PyObject *M_Window_DrawProgressBar (PyObject *self, PyObject *args);
-static PyObject *M_Window_GetCursorPos (PyObject *self);
-static PyObject *M_Window_SetCursorPos (PyObject *self, PyObject *args);
-static PyObject *M_Window_GetViewVector (PyObject *self);
-static PyObject *M_Window_GetViewMatrix (PyObject *self);
-
-/*****************************************************************************/
-/* The following string definitions are used for documentation strings.      */
-/* In Python these will be written to the console when doing a               */
-/* Blender.Window.__doc__                                                    */
-/*****************************************************************************/
-char M_Window_doc[] =
-"The Blender Window module\n\n";
-
-char M_Window_Redraw_doc[] =
-"() - Force a redraw of a specific Window Type (see Window.Types)";
-
-char M_Window_RedrawAll_doc[] =
-"() - Redraw all windows";
-
-char M_Window_QRedrawAll_doc[] =
-"() - Redraw all windows by queue event";
-
-char M_Window_FileSelector_doc[] =
-"(callback [, title]) - Open a file selector window.\n\
-The selected filename is used as argument to a function callback f(name)\n\
-that you must provide. 'title' is optional and defaults to 'SELECT FILE'.\n\n\
-Example:\n\n\
-import Blender\n\n\
-def my_function(filename):\n\
-  print 'The selected file was: ', filename\n\n\
-Blender.Window.FileSelector(my_function, 'SAVE FILE')\n";
-
-char M_Window_ImageSelector_doc[] =
-"(callback [, title]) - Open an image selector window.\n\
-The selected filename is used as argument to a function callback f(name)\n\
-that you must provide. 'title' is optional and defaults to 'SELECT IMAGE'.\n\n\
-Example:\n\n\
-import Blender\n\n\
-def my_function(filename):\n\
-  print 'The selected image file was: ', filename\n\n\
-Blender.Window.ImageSelector(my_function, 'LOAD IMAGE')\n";
-
-char M_Window_DrawProgressBar_doc[] =
-"(done, text) - Draw a progress bar.\n\
-'done' is a float value <= 1.0, 'text' contains info about what is\n\
-currently being done.";
-
-char M_Window_GetCursorPos_doc[] =
-"() - Get the current 3d cursor position as a list of three floats.";
-
-char M_Window_SetCursorPos_doc[] =
-"([f,f,f]) - Set the current 3d cursor position from a list of three floats.";
-
-char M_Window_GetViewVector_doc[] =
-"() - Get the current 3d view vector as a list of three floats [x,y,z].";
-
-char M_Window_GetViewMatrix_doc[] =
-"() - Get the current 3d view matrix.";
-
-/*****************************************************************************/
-/* Python method structure definition for Blender.Window module:             */
-/*****************************************************************************/
-struct PyMethodDef M_Window_methods[] = {
-  {"Redraw",     M_Window_Redraw,     METH_VARARGS, M_Window_Redraw_doc},
-  {"RedrawAll",  M_Window_RedrawAll,  METH_VARARGS, M_Window_RedrawAll_doc},
-  {"QRedrawAll", M_Window_QRedrawAll, METH_VARARGS, M_Window_QRedrawAll_doc},
-  {"FileSelector", M_Window_FileSelector, METH_VARARGS,
-          M_Window_FileSelector_doc},
-  {"ImageSelector", M_Window_ImageSelector, METH_VARARGS,
-          M_Window_ImageSelector_doc},
-  {"DrawProgressBar", M_Window_DrawProgressBar,  METH_VARARGS,
-          M_Window_DrawProgressBar_doc},
-  {"drawProgressBar", M_Window_DrawProgressBar,  METH_VARARGS,
-          M_Window_DrawProgressBar_doc},
-  {"GetCursorPos", (PyCFunction)M_Window_GetCursorPos,  METH_NOARGS,
-          M_Window_GetCursorPos_doc},
-  {"SetCursorPos", M_Window_SetCursorPos,  METH_VARARGS,
-          M_Window_SetCursorPos_doc},
-  {"GetViewVector", (PyCFunction)M_Window_GetViewVector,  METH_NOARGS,
-          M_Window_GetViewVector_doc},
-  {"GetViewMatrix", (PyCFunction)M_Window_GetViewMatrix,  METH_NOARGS,
-          M_Window_GetViewMatrix_doc},
-  {NULL, NULL, 0, NULL}
-};
-
 #endif /* EXPP_WINDOW_H */