AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some more tweaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2001-05-20 02:00:31 +00:00
parent 2b510feb17
commit 25d73e0f28
4 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wxPython/demo/wxJoystick.py
View File

@ -13,9 +13,13 @@ class JoystickTestPanel(wxPanel):
MakeJoystickTestPanel( self, true )
self.stick = wxJoystick()
self.stick.SetCapture(self)
EVT_JOYSTICK_EVENTS(self, self.OnJoystick)
try:
self.stick = wxJoystick()
self.stick.SetCapture(self)
EVT_JOYSTICK_EVENTS(self, self.OnJoystick)
self.UpdateFields()
except NotImplementedError, v:
wxMessageBox(str(v), "Exception Message")
def UpdateFields(self):

28
wxPython/src/gtk/misc2.cpp
View File

@ -5671,6 +5671,33 @@ static PyObject *_wrap_new_wxJoystick(PyObject *self, PyObject *args, PyObject *
return _resultobj;
}
#define delete_wxJoystick(_swigobj) (delete _swigobj)
static PyObject *_wrap_delete_wxJoystick(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxJoystick * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxJoystick",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxJoystick_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxJoystick. Expected _wxJoystick_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
delete_wxJoystick(_arg0);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxJoystick_GetPosition(_swigobj) (_swigobj->GetPosition())
static PyObject *_wrap_wxJoystick_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@ -7017,6 +7044,7 @@ static PyMethodDef misc2cMethods[] = {
{ "wxJoystick_GetButtonState", (PyCFunction) _wrap_wxJoystick_GetButtonState, METH_VARARGS | METH_KEYWORDS },
{ "wxJoystick_GetZPosition", (PyCFunction) _wrap_wxJoystick_GetZPosition, METH_VARARGS | METH_KEYWORDS },
{ "wxJoystick_GetPosition", (PyCFunction) _wrap_wxJoystick_GetPosition, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxJoystick", (PyCFunction) _wrap_delete_wxJoystick, METH_VARARGS | METH_KEYWORDS },
{ "new_wxJoystick", (PyCFunction) _wrap_new_wxJoystick, METH_VARARGS | METH_KEYWORDS },
{ "wxProcess_CloseOutput", (PyCFunction) _wrap_wxProcess_CloseOutput, METH_VARARGS | METH_KEYWORDS },
{ "wxProcess_GetOutputStream", (PyCFunction) _wrap_wxProcess_GetOutputStream, METH_VARARGS | METH_KEYWORDS },

3
wxPython/src/gtk/misc2.py
View File

@ -492,6 +492,9 @@ class wxJoystickPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,misc2c=misc2c):
if self.thisown == 1 :
misc2c.delete_wxJoystick(self)
def GetPosition(self, *_args, **_kwargs):
val = apply(misc2c.wxJoystick_GetPosition,(self,) + _args, _kwargs)
if val: val = wxPointPtr(val) ; val.thisown = 1

8
wxPython/src/gtk/wx.py
View File

@ -1456,10 +1456,10 @@ def EVT_END_PROCESS(eh, id, func):
# wxJoyStick
def EVT_JOY_DOWN(win, func):
win.Connect(-1, -1, wxEVT_JOY_DOWN, func)
win.Connect(-1, -1, wxEVT_JOY_BUTTON_DOWN, func)
def EVT_JOY_UP(win, func):
win.Connect(-1, -1, wxEVT_JOY_UP, func)
win.Connect(-1, -1, wxEVT_JOY_BUTTON_UP, func)
def EVT_JOY_MOVE(win, func):
win.Connect(-1, -1, wxEVT_JOY_MOVE, func)
@ -1468,8 +1468,8 @@ def EVT_JOY_ZMOVE(win, func):
win.Connect(-1, -1, wxEVT_JOY_ZMOVE, func)
def EVT_JOYSTICK_EVENTS(win, func):
win.Connect(-1, -1, wxEVT_JOY_DOWN, func)
win.Connect(-1, -1, wxEVT_JOY_UP, func)
win.Connect(-1, -1, wxEVT_JOY_BUTTON_DOWN, func)
win.Connect(-1, -1, wxEVT_JOY_BUTTON_UP, func)
win.Connect(-1, -1, wxEVT_JOY_MOVE, func)
win.Connect(-1, -1, wxEVT_JOY_ZMOVE, func)