mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added the window constructor from an existing control

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1070 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
remi-k 2009-03-29 13:36:24 +00:00
parent e2cb404ab2
commit 37d3bc2196
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/src/RenderWindow.cpp
View File

@ -244,11 +244,13 @@ PyTypeObject PySfRenderWindowType = {
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
"Simple wrapper for sf.Window that allows easy 2D rendering.\n\ "Simple wrapper for sf.Window that allows easy 2D rendering.\n\
Default constructor : sf.RenderWindow()\n\ Default constructor : sf.RenderWindow()\n\
Other constructor : sf.RenderWindow(Mode, Title, Style::Resize|Style::Close, Params = WindowSettings())\n\ Construct a new window : sf.RenderWindow(Mode, Title, Style::Resize|Style::Close, Params = WindowSettings())\n\
Parameters:\n\
Mode : Video mode to use\n\ Mode : Video mode to use\n\
Title : Title of the window\n\ Title : Title of the window\n\
WindowStyle : Window style (Resize | Close by default)\n\ WindowStyle : Window style (Resize | Close by default)\n\
Params : Creation parameters (see default constructor for default values)\n\
Construct the window from an existing control : sf.RenderWindow(Handle, Params)\n\
Handle : handle of the control (long integer)\n\
Params : Creation parameters (see default constructor for default values)", /* tp_doc */ Params : Creation parameters (see default constructor for default values)", /* tp_doc */
0, /* tp_traverse */ 0, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */

43
python/src/Window.cpp
View File

@ -48,11 +48,29 @@ PySfWindow_dealloc(PySfWindow* self)
static PyObject * static PyObject *
PySfWindow_new(PyTypeObject *type, PyObject *args, PyObject *kwds) PySfWindow_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{ {
long Handle;
PySfWindowSettings *Params=NULL;
PySfWindow *self; PySfWindow *self;
self = (PySfWindow *)type->tp_alloc(type, 0); self = (PySfWindow *)type->tp_alloc(type, 0);
if (self != NULL) if (self != NULL)
self->obj = new sf::Window(); {
if (PyArg_ParseTuple(args, "l|O!:Window.__new__", &Handle, &PySfWindowSettingsType, &Params))
{
if (Params)
{
PySfWindowSettingsUpdate(Params);
self->obj = new sf::Window((sf::WindowHandle)Handle, *(Params->obj));
}
else
self->obj = new sf::Window((sf::WindowHandle)Handle);
}
else
{
PyErr_Clear();
self->obj = new sf::Window();
}
}
return (PyObject *)self; return (PyObject *)self;
} }
@ -99,7 +117,6 @@ PySfWindow_GetEvent(PySfWindow *self, PyObject *args)
} }
PyObject* PyObject*
PySfWindow_Create(PySfWindow* self, PyObject *args, PyObject *kwds) PySfWindow_Create(PySfWindow* self, PyObject *args, PyObject *kwds)
{ {
@ -109,7 +126,7 @@ PySfWindow_Create(PySfWindow* self, PyObject *args, PyObject *kwds)
unsigned long WindowStyle = sf::Style::Resize | sf::Style::Close; unsigned long WindowStyle = sf::Style::Resize | sf::Style::Close;
PySfWindowSettings *Params=NULL; PySfWindowSettings *Params=NULL;
const char *kwlist[] = {"VideoMode", "Title", "WindowStyle", "Params", NULL}; const char *kwlist[] = {"VideoMode", "Title", "WindowStyle", "Params", NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!s|IO!:Window.Create", (char **)kwlist, &PySfVideoModeType, &VideoModeTmp, &Title, &WindowStyle, &PySfWindowSettingsType, &Params)) if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!s|IO!:Window.Create", (char **)kwlist, &PySfVideoModeType, &VideoModeTmp, &Title, &WindowStyle, &PySfWindowSettingsType, &Params))
return NULL; return NULL;
@ -131,9 +148,17 @@ PySfWindow_Create(PySfWindow* self, PyObject *args, PyObject *kwds)
static int static int
PySfWindow_init(PySfWindow *self, PyObject *args, PyObject *kwds) PySfWindow_init(PySfWindow *self, PyObject *args, PyObject *kwds)
{ {
if (args != NULL) long Handle;
PySfWindowSettings *Params;
if (args != NULL)
{
if (PyArg_ParseTuple(args, "l|O!:Window.__new__", &Handle, &PySfWindowSettingsType, &Params))
return 0;
PyErr_Clear();
if (PySfWindow_Create(self, args, kwds) == NULL) if (PySfWindow_Create(self, args, kwds) == NULL)
return -1; return -1;
}
return 0; return 0;
} }
@ -344,7 +369,9 @@ Construct a new window : sf.Window(Mode, Title, sf.Style.Resize | sf.Style.Close
Title : Title of the window\n\ Title : Title of the window\n\
WindowStyle : Window style (Resize | Close by default)\n\ WindowStyle : Window style (Resize | Close by default)\n\
Params : Creation parameters (see default constructor for default values)\n\ Params : Creation parameters (see default constructor for default values)\n\
", /* tp_doc */ Construct the window from an existing control : sf.Window(Handle, Params)\n\
Handle : Platform-specific handle of the control\n\
Params : Creation parameters (see default constructor for default values)", /* tp_doc */
0, /* tp_traverse */ 0, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
0, /* tp_richcompare */ 0, /* tp_richcompare */