Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Follow up for changes in wxWindows to various event classes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-02-06 22:55:22 +00:00
parent 631f1bfed5
commit e980740ac5
3 changed files with 47 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
utils/wxPython/src/events.i
View File

@@ -54,15 +54,12 @@ public:
class wxCloseEvent : public wxEvent {
public:
bool CanVeto();
// **** bool GetSessionEnding();
void SetLoggingOff(bool loggingOff);
bool GetLoggingOff();
void Veto(bool veto = TRUE);
bool CanVeto();
bool GetVeto();
void SetForce(bool force);
void SetCanVeto(bool canVeto);
void SetLoggingOff(bool loggingOff);
bool GetForce();
};
//---------------------------------------------------------------------------
@@ -140,9 +137,10 @@ public:
bool AltDown();
bool ShiftDown();
long KeyCode();
void Position(float *OUTPUT, float *OUTPUT);
float GetX();
float GetY();
// void Position(float *OUTPUT, float *OUTPUT);
// float GetX();
// float GetY();
};
//---------------------------------------------------------------------------
@@ -300,6 +298,9 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.6 1999/02/06 22:55:00 RD
// Follow up for changes in wxWindows to various event classes
//
// Revision 1.5 1998/12/15 20:41:17 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about

199
utils/wxPython/src/msw/events.cpp
View File

@@ -379,24 +379,27 @@ static void *SwigwxCloseEventTowxEvent(void *ptr) {
return (void *) dest;
}
#define wxCloseEvent_CanVeto(_swigobj) (_swigobj->CanVeto())
static PyObject *_wrap_wxCloseEvent_CanVeto(PyObject *self, PyObject *args) {
#define wxCloseEvent_SetLoggingOff(_swigobj,_swigarg0) (_swigobj->SetLoggingOff(_swigarg0))
static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxCloseEvent * _arg0;
bool _arg1;
char * _argc0 = 0;
int tempbool1;
self = self;
if(!PyArg_ParseTuple(args,"s:wxCloseEvent_CanVeto",&_argc0))
if(!PyArg_ParseTuple(args,"si:wxCloseEvent_SetLoggingOff",&_argc0,&tempbool1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_CanVeto. Expected _wxCloseEvent_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetLoggingOff. Expected _wxCloseEvent_p.");
return NULL;
}
}
_result = (bool )wxCloseEvent_CanVeto(_arg0);
_resultobj = Py_BuildValue("i",_result);
_arg1 = (bool ) tempbool1;
wxCloseEvent_SetLoggingOff(_arg0,_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
@@ -445,6 +448,27 @@ static PyObject *_wrap_wxCloseEvent_Veto(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxCloseEvent_CanVeto(_swigobj) (_swigobj->CanVeto())
static PyObject *_wrap_wxCloseEvent_CanVeto(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxCloseEvent * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxCloseEvent_CanVeto",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_CanVeto. Expected _wxCloseEvent_p.");
return NULL;
}
}
_result = (bool )wxCloseEvent_CanVeto(_arg0);
_resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxCloseEvent_GetVeto(_swigobj) (_swigobj->GetVeto())
static PyObject *_wrap_wxCloseEvent_GetVeto(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -466,30 +490,6 @@ static PyObject *_wrap_wxCloseEvent_GetVeto(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxCloseEvent_SetForce(_swigobj,_swigarg0) (_swigobj->SetForce(_swigarg0))
static PyObject *_wrap_wxCloseEvent_SetForce(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxCloseEvent * _arg0;
bool _arg1;
char * _argc0 = 0;
int tempbool1;
self = self;
if(!PyArg_ParseTuple(args,"si:wxCloseEvent_SetForce",&_argc0,&tempbool1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetForce. Expected _wxCloseEvent_p.");
return NULL;
}
}
_arg1 = (bool ) tempbool1;
wxCloseEvent_SetForce(_arg0,_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxCloseEvent_SetCanVeto(_swigobj,_swigarg0) (_swigobj->SetCanVeto(_swigarg0))
static PyObject *_wrap_wxCloseEvent_SetCanVeto(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -514,51 +514,6 @@ static PyObject *_wrap_wxCloseEvent_SetCanVeto(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxCloseEvent_SetLoggingOff(_swigobj,_swigarg0) (_swigobj->SetLoggingOff(_swigarg0))
static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxCloseEvent * _arg0;
bool _arg1;
char * _argc0 = 0;
int tempbool1;
self = self;
if(!PyArg_ParseTuple(args,"si:wxCloseEvent_SetLoggingOff",&_argc0,&tempbool1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetLoggingOff. Expected _wxCloseEvent_p.");
return NULL;
}
}
_arg1 = (bool ) tempbool1;
wxCloseEvent_SetLoggingOff(_arg0,_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxCloseEvent_GetForce(_swigobj) (_swigobj->GetForce())
static PyObject *_wrap_wxCloseEvent_GetForce(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxCloseEvent * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxCloseEvent_GetForce",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_GetForce. Expected _wxCloseEvent_p.");
return NULL;
}
}
_result = (bool )wxCloseEvent_GetForce(_arg0);
_resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static void *SwigwxCommandEventTowxEvent(void *ptr) {
wxCommandEvent *src;
wxEvent *dest;
@@ -1584,89 +1539,6 @@ static PyObject *_wrap_wxKeyEvent_KeyCode(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxKeyEvent_Position(_swigobj,_swigarg0,_swigarg1) (_swigobj->Position(_swigarg0,_swigarg1))
static PyObject *_wrap_wxKeyEvent_Position(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxKeyEvent * _arg0;
float * _arg1;
float temp;
float * _arg2;
float temp0;
char * _argc0 = 0;
self = self;
{
_arg1 = &temp;
}
{
_arg2 = &temp0;
}
if(!PyArg_ParseTuple(args,"s:wxKeyEvent_Position",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxKeyEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_Position. Expected _wxKeyEvent_p.");
return NULL;
}
}
wxKeyEvent_Position(_arg0,_arg1,_arg2);
Py_INCREF(Py_None);
_resultobj = Py_None;
{
PyObject *o;
o = PyFloat_FromDouble((double) (*_arg1));
_resultobj = t_output_helper(_resultobj, o);
}
{
PyObject *o;
o = PyFloat_FromDouble((double) (*_arg2));
_resultobj = t_output_helper(_resultobj, o);
}
return _resultobj;
}
#define wxKeyEvent_GetX(_swigobj) (_swigobj->GetX())
static PyObject *_wrap_wxKeyEvent_GetX(PyObject *self, PyObject *args) {
PyObject * _resultobj;
float _result;
wxKeyEvent * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxKeyEvent_GetX",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxKeyEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_GetX. Expected _wxKeyEvent_p.");
return NULL;
}
}
_result = (float )wxKeyEvent_GetX(_arg0);
_resultobj = Py_BuildValue("f",_result);
return _resultobj;
}
#define wxKeyEvent_GetY(_swigobj) (_swigobj->GetY())
static PyObject *_wrap_wxKeyEvent_GetY(PyObject *self, PyObject *args) {
PyObject * _resultobj;
float _result;
wxKeyEvent * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxKeyEvent_GetY",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxKeyEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxKeyEvent_GetY. Expected _wxKeyEvent_p.");
return NULL;
}
}
_result = (float )wxKeyEvent_GetY(_arg0);
_resultobj = Py_BuildValue("f",_result);
return _resultobj;
}
static void *SwigwxMoveEventTowxEvent(void *ptr) {
wxMoveEvent *src;
wxEvent *dest;
@@ -2649,9 +2521,6 @@ static PyMethodDef eventscMethods[] = {
{ "wxActivateEvent_GetActive", _wrap_wxActivateEvent_GetActive, 1 },
{ "wxEraseEvent_GetDC", _wrap_wxEraseEvent_GetDC, 1 },
{ "wxMoveEvent_GetPosition", _wrap_wxMoveEvent_GetPosition, 1 },
{ "wxKeyEvent_GetY", _wrap_wxKeyEvent_GetY, 1 },
{ "wxKeyEvent_GetX", _wrap_wxKeyEvent_GetX, 1 },
{ "wxKeyEvent_Position", _wrap_wxKeyEvent_Position, 1 },
{ "wxKeyEvent_KeyCode", _wrap_wxKeyEvent_KeyCode, 1 },
{ "wxKeyEvent_ShiftDown", _wrap_wxKeyEvent_ShiftDown, 1 },
{ "wxKeyEvent_AltDown", _wrap_wxKeyEvent_AltDown, 1 },
@@ -2696,14 +2565,12 @@ static PyMethodDef eventscMethods[] = {
{ "wxCommandEvent_GetInt", _wrap_wxCommandEvent_GetInt, 1 },
{ "wxCommandEvent_GetExtraLong", _wrap_wxCommandEvent_GetExtraLong, 1 },
{ "wxCommandEvent_Checked", _wrap_wxCommandEvent_Checked, 1 },
{ "wxCloseEvent_GetForce", _wrap_wxCloseEvent_GetForce, 1 },
{ "wxCloseEvent_SetLoggingOff", _wrap_wxCloseEvent_SetLoggingOff, 1 },
{ "wxCloseEvent_SetCanVeto", _wrap_wxCloseEvent_SetCanVeto, 1 },
{ "wxCloseEvent_SetForce", _wrap_wxCloseEvent_SetForce, 1 },
{ "wxCloseEvent_GetVeto", _wrap_wxCloseEvent_GetVeto, 1 },
{ "wxCloseEvent_CanVeto", _wrap_wxCloseEvent_CanVeto, 1 },
{ "wxCloseEvent_Veto", _wrap_wxCloseEvent_Veto, 1 },
{ "wxCloseEvent_GetLoggingOff", _wrap_wxCloseEvent_GetLoggingOff, 1 },
{ "wxCloseEvent_CanVeto", _wrap_wxCloseEvent_CanVeto, 1 },
{ "wxCloseEvent_SetLoggingOff", _wrap_wxCloseEvent_SetLoggingOff, 1 },
{ "wxSizeEvent_GetSize", _wrap_wxSizeEvent_GetSize, 1 },
{ "wxEvent_Skip", _wrap_wxEvent_Skip, 1 },
{ "wxEvent_SetTimestamp", _wrap_wxEvent_SetTimestamp, 1 },

25
utils/wxPython/src/msw/events.py
View File

@@ -67,8 +67,8 @@ class wxCloseEventPtr(wxEventPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def CanVeto(self):
val = eventsc.wxCloseEvent_CanVeto(self.this)
def SetLoggingOff(self,arg0):
val = eventsc.wxCloseEvent_SetLoggingOff(self.this,arg0)
return val
def GetLoggingOff(self):
val = eventsc.wxCloseEvent_GetLoggingOff(self.this)
@@ -76,21 +76,15 @@ class wxCloseEventPtr(wxEventPtr):
def Veto(self,*args):
val = apply(eventsc.wxCloseEvent_Veto,(self.this,)+args)
return val
def CanVeto(self):
val = eventsc.wxCloseEvent_CanVeto(self.this)
return val
def GetVeto(self):
val = eventsc.wxCloseEvent_GetVeto(self.this)
return val
def SetForce(self,arg0):
val = eventsc.wxCloseEvent_SetForce(self.this,arg0)
return val
def SetCanVeto(self,arg0):
val = eventsc.wxCloseEvent_SetCanVeto(self.this,arg0)
return val
def SetLoggingOff(self,arg0):
val = eventsc.wxCloseEvent_SetLoggingOff(self.this,arg0)
return val
def GetForce(self):
val = eventsc.wxCloseEvent_GetForce(self.this)
return val
def __repr__(self):
return "<C wxCloseEvent instance>"
class wxCloseEvent(wxCloseEventPtr):
@@ -292,15 +286,6 @@ class wxKeyEventPtr(wxEventPtr):
def KeyCode(self):
val = eventsc.wxKeyEvent_KeyCode(self.this)
return val
def Position(self):
val = eventsc.wxKeyEvent_Position(self.this)
return val
def GetX(self):
val = eventsc.wxKeyEvent_GetX(self.this)
return val
def GetY(self):
val = eventsc.wxKeyEvent_GetY(self.this)
return val
def __repr__(self):
return "<C wxKeyEvent instance>"
class wxKeyEvent(wxKeyEventPtr):