include point and rect from otk so that they can have objects returned instead of strings
This commit is contained in:
parent
345d957e1e
commit
0d00827947
1 changed files with 5 additions and 22 deletions
|
@ -27,33 +27,13 @@
|
||||||
|
|
||||||
%{
|
%{
|
||||||
namespace ob {
|
namespace ob {
|
||||||
void python_callback(PyObject *func, MotionData *data)
|
void python_callback(PyObject *func, MouseData *data)
|
||||||
{
|
{
|
||||||
PyObject *arglist;
|
PyObject *arglist;
|
||||||
PyObject *result;
|
PyObject *result;
|
||||||
|
|
||||||
arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
|
arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
|
||||||
SWIGTYPE_p_ob__MotionData,
|
SWIGTYPE_p_ob__MouseData,
|
||||||
0));
|
|
||||||
|
|
||||||
// call the callback
|
|
||||||
result = PyEval_CallObject(func, arglist);
|
|
||||||
if (!result || PyErr_Occurred()) {
|
|
||||||
// an exception occured in the script, display it
|
|
||||||
PyErr_Print();
|
|
||||||
}
|
|
||||||
|
|
||||||
Py_XDECREF(result);
|
|
||||||
Py_DECREF(arglist);
|
|
||||||
}
|
|
||||||
|
|
||||||
void python_callback(PyObject *func, ButtonData *data)
|
|
||||||
{
|
|
||||||
PyObject *arglist;
|
|
||||||
PyObject *result;
|
|
||||||
|
|
||||||
arglist = Py_BuildValue("(O)", SWIG_NewPointerObj((void *) data,
|
|
||||||
SWIGTYPE_p_ob__ButtonData,
|
|
||||||
0));
|
0));
|
||||||
|
|
||||||
// call the callback
|
// call the callback
|
||||||
|
@ -132,6 +112,9 @@ void python_callback(PyObject *func, KeyData *data)
|
||||||
%import "widget.hh"
|
%import "widget.hh"
|
||||||
%import "actions.hh"
|
%import "actions.hh"
|
||||||
|
|
||||||
|
%include "../otk/point.hh"
|
||||||
|
%include "../otk/rect.hh"
|
||||||
|
|
||||||
%include "openbox.hh"
|
%include "openbox.hh"
|
||||||
%include "screen.hh"
|
%include "screen.hh"
|
||||||
%include "client.hh"
|
%include "client.hh"
|
||||||
|
|
Loading…
Reference in a new issue