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

Move wxContextMenuEvent back into the core

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-07-06 00:48:25 +00:00
parent 752cd08c65
commit bd5dfc0725
6 changed files with 172 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wxPython/src/events.i
View File

@@ -511,6 +511,18 @@ public:
//---------------------------------------------------------------------------
class wxContextMenuEvent : public wxCommandEvent
{
public:
wxContextMenuEvent(wxEventType type = wxEVT_NULL,
wxWindowID id = 0,
const wxPoint& pt = wxDefaultPosition);
const wxPoint& GetPosition();
void SetPosition(const wxPoint& pos);
};
//----------------------------------------------------------------------
class wxTimerEvent : public wxEvent
{
public:

15
wxPython/src/help.i
View File

@@ -73,21 +73,6 @@ public:
//---------------------------------------------------------------------------
class wxContextMenuEvent : public wxCommandEvent
{
public:
wxContextMenuEvent(wxEventType type = wxEVT_NULL,
wxWindowID id = 0,
const wxPoint& pt = wxDefaultPosition);
const wxPoint& GetPosition();
void SetPosition(const wxPoint& pos);
};
//----------------------------------------------------------------------
class wxContextHelp : public wxObject {
public:
wxContextHelp(wxWindow* window = NULL, bool doNow = TRUE);

139
wxPython/src/msw/events.cpp
View File

@@ -7077,6 +7077,139 @@ static PyObject *_wrap_wxWindowDestroyEvent_GetWindow(PyObject *self, PyObject *
return _resultobj;
}
static void *SwigwxContextMenuEventTowxCommandEvent(void *ptr) {
wxContextMenuEvent *src;
wxCommandEvent *dest;
src = (wxContextMenuEvent *) ptr;
dest = (wxCommandEvent *) src;
return (void *) dest;
}
static void *SwigwxContextMenuEventTowxEvent(void *ptr) {
wxContextMenuEvent *src;
wxEvent *dest;
src = (wxContextMenuEvent *) ptr;
dest = (wxEvent *) src;
return (void *) dest;
}
static void *SwigwxContextMenuEventTowxObject(void *ptr) {
wxContextMenuEvent *src;
wxObject *dest;
src = (wxContextMenuEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxContextMenuEvent(_swigarg0,_swigarg1,_swigarg2) (new wxContextMenuEvent(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_new_wxContextMenuEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxContextMenuEvent * _result;
wxEventType _arg0 = (wxEventType ) wxEVT_NULL;
wxWindowID _arg1 = (wxWindowID ) 0;
wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
wxPoint temp;
PyObject * _obj2 = 0;
char *_kwnames[] = { "type","id","pt", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiO:new_wxContextMenuEvent",_kwnames,&_arg0,&_arg1,&_obj2))
return NULL;
if (_obj2)
{
_arg2 = &temp;
if (! wxPoint_helper(_obj2, &_arg2))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxContextMenuEvent *)new_wxContextMenuEvent(_arg0,_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxContextMenuEvent_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define wxContextMenuEvent_GetPosition(_swigobj) (_swigobj->GetPosition())
static PyObject *_wrap_wxContextMenuEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPoint * _result;
wxContextMenuEvent * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxContextMenuEvent_GetPosition",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxContextMenuEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxContextMenuEvent_GetPosition. Expected _wxContextMenuEvent_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxPoint & _result_ref = wxContextMenuEvent_GetPosition(_arg0);
_result = (wxPoint *) &_result_ref;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define wxContextMenuEvent_SetPosition(_swigobj,_swigarg0) (_swigobj->SetPosition(_swigarg0))
static PyObject *_wrap_wxContextMenuEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxContextMenuEvent * _arg0;
wxPoint * _arg1;
PyObject * _argo0 = 0;
wxPoint temp;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","pos", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxContextMenuEvent_SetPosition",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxContextMenuEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxContextMenuEvent_SetPosition. Expected _wxContextMenuEvent_p.");
return NULL;
}
}
{
_arg1 = &temp;
if (! wxPoint_helper(_obj1, &_arg1))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxContextMenuEvent_SetPosition(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static void *SwigwxTimerEventTowxEvent(void *ptr) {
wxTimerEvent *src;
wxEvent *dest;
@@ -7588,6 +7721,9 @@ static PyMethodDef eventscMethods[] = {
{ "new_wxTextUrlEvent", (PyCFunction) _wrap_new_wxTextUrlEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxTimerEvent_GetInterval", (PyCFunction) _wrap_wxTimerEvent_GetInterval, METH_VARARGS | METH_KEYWORDS },
{ "new_wxTimerEvent", (PyCFunction) _wrap_new_wxTimerEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxContextMenuEvent_SetPosition", (PyCFunction) _wrap_wxContextMenuEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
{ "wxContextMenuEvent_GetPosition", (PyCFunction) _wrap_wxContextMenuEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
{ "new_wxContextMenuEvent", (PyCFunction) _wrap_new_wxContextMenuEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxWindowDestroyEvent_GetWindow", (PyCFunction) _wrap_wxWindowDestroyEvent_GetWindow, METH_VARARGS | METH_KEYWORDS },
{ "new_wxWindowDestroyEvent", (PyCFunction) _wrap_new_wxWindowDestroyEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxWindowCreateEvent_GetWindow", (PyCFunction) _wrap_wxWindowCreateEvent_GetWindow, METH_VARARGS | METH_KEYWORDS },
@@ -7819,6 +7955,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxEvent","_wxPyEvent",SwigwxPyEventTowxEvent},
{ "_wxEvent","_wxTextUrlEvent",SwigwxTextUrlEventTowxEvent},
{ "_wxEvent","_wxTimerEvent",SwigwxTimerEventTowxEvent},
{ "_wxEvent","_wxContextMenuEvent",SwigwxContextMenuEventTowxEvent},
{ "_wxEvent","_wxWindowDestroyEvent",SwigwxWindowDestroyEventTowxEvent},
{ "_wxEvent","_wxWindowCreateEvent",SwigwxWindowCreateEventTowxEvent},
{ "_wxEvent","_wxQueryNewPaletteEvent",SwigwxQueryNewPaletteEventTowxEvent},
@@ -7882,6 +8019,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxChar","_char",0},
{ "_wxCommandEvent","_wxPyCommandEvent",SwigwxPyCommandEventTowxCommandEvent},
{ "_wxCommandEvent","_wxTextUrlEvent",SwigwxTextUrlEventTowxCommandEvent},
{ "_wxCommandEvent","_wxContextMenuEvent",SwigwxContextMenuEventTowxCommandEvent},
{ "_wxCommandEvent","_wxWindowDestroyEvent",SwigwxWindowDestroyEventTowxCommandEvent},
{ "_wxCommandEvent","_wxWindowCreateEvent",SwigwxWindowCreateEventTowxCommandEvent},
{ "_wxCommandEvent","_wxNotifyEvent",SwigwxNotifyEventTowxCommandEvent},
@@ -7912,6 +8050,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxPyEvent",SwigwxPyEventTowxObject},
{ "_wxObject","_wxTextUrlEvent",SwigwxTextUrlEventTowxObject},
{ "_wxObject","_wxTimerEvent",SwigwxTimerEventTowxObject},
{ "_wxObject","_wxContextMenuEvent",SwigwxContextMenuEventTowxObject},
{ "_wxObject","_wxWindowDestroyEvent",SwigwxWindowDestroyEventTowxObject},
{ "_wxObject","_wxWindowCreateEvent",SwigwxWindowCreateEventTowxObject},
{ "_wxObject","_wxQueryNewPaletteEvent",SwigwxQueryNewPaletteEventTowxObject},

21
wxPython/src/msw/events.py
View File

@@ -1030,6 +1030,27 @@ class wxWindowDestroyEvent(wxWindowDestroyEventPtr):
class wxContextMenuEventPtr(wxCommandEventPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def GetPosition(self, *_args, **_kwargs):
val = apply(eventsc.wxContextMenuEvent_GetPosition,(self,) + _args, _kwargs)
if val: val = wxPointPtr(val)
return val
def SetPosition(self, *_args, **_kwargs):
val = apply(eventsc.wxContextMenuEvent_SetPosition,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxContextMenuEvent instance at %s>" % (self.this,)
class wxContextMenuEvent(wxContextMenuEventPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(eventsc.new_wxContextMenuEvent,_args,_kwargs)
self.thisown = 1
class wxTimerEventPtr(wxEventPtr):
def __init__(self,this):
self.this = this

139
wxPython/src/msw/help.cpp
View File

@@ -368,139 +368,6 @@ static PyObject *_wrap_wxHelpEvent_SetTarget(PyObject *self, PyObject *args, PyO
return _resultobj;
}
static void *SwigwxContextMenuEventTowxCommandEvent(void *ptr) {
wxContextMenuEvent *src;
wxCommandEvent *dest;
src = (wxContextMenuEvent *) ptr;
dest = (wxCommandEvent *) src;
return (void *) dest;
}
static void *SwigwxContextMenuEventTowxEvent(void *ptr) {
wxContextMenuEvent *src;
wxEvent *dest;
src = (wxContextMenuEvent *) ptr;
dest = (wxEvent *) src;
return (void *) dest;
}
static void *SwigwxContextMenuEventTowxObject(void *ptr) {
wxContextMenuEvent *src;
wxObject *dest;
src = (wxContextMenuEvent *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxContextMenuEvent(_swigarg0,_swigarg1,_swigarg2) (new wxContextMenuEvent(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_new_wxContextMenuEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxContextMenuEvent * _result;
wxEventType _arg0 = (wxEventType ) wxEVT_NULL;
wxWindowID _arg1 = (wxWindowID ) 0;
wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
wxPoint temp;
PyObject * _obj2 = 0;
char *_kwnames[] = { "type","id","pt", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iiO:new_wxContextMenuEvent",_kwnames,&_arg0,&_arg1,&_obj2))
return NULL;
if (_obj2)
{
_arg2 = &temp;
if (! wxPoint_helper(_obj2, &_arg2))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxContextMenuEvent *)new_wxContextMenuEvent(_arg0,_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxContextMenuEvent_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define wxContextMenuEvent_GetPosition(_swigobj) (_swigobj->GetPosition())
static PyObject *_wrap_wxContextMenuEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPoint * _result;
wxContextMenuEvent * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxContextMenuEvent_GetPosition",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxContextMenuEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxContextMenuEvent_GetPosition. Expected _wxContextMenuEvent_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxPoint & _result_ref = wxContextMenuEvent_GetPosition(_arg0);
_result = (wxPoint *) &_result_ref;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define wxContextMenuEvent_SetPosition(_swigobj,_swigarg0) (_swigobj->SetPosition(_swigarg0))
static PyObject *_wrap_wxContextMenuEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxContextMenuEvent * _arg0;
wxPoint * _arg1;
PyObject * _argo0 = 0;
wxPoint temp;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","pos", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxContextMenuEvent_SetPosition",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxContextMenuEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxContextMenuEvent_SetPosition. Expected _wxContextMenuEvent_p.");
return NULL;
}
}
{
_arg1 = &temp;
if (! wxPoint_helper(_obj1, &_arg1))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxContextMenuEvent_SetPosition(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static void *SwigwxContextHelpTowxObject(void *ptr) {
wxContextHelp *src;
wxObject *dest;
@@ -1049,9 +916,6 @@ static PyMethodDef helpcMethods[] = {
{ "wxContextHelp_BeginContextHelp", (PyCFunction) _wrap_wxContextHelp_BeginContextHelp, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxContextHelp", (PyCFunction) _wrap_delete_wxContextHelp, METH_VARARGS | METH_KEYWORDS },
{ "new_wxContextHelp", (PyCFunction) _wrap_new_wxContextHelp, METH_VARARGS | METH_KEYWORDS },
{ "wxContextMenuEvent_SetPosition", (PyCFunction) _wrap_wxContextMenuEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
{ "wxContextMenuEvent_GetPosition", (PyCFunction) _wrap_wxContextMenuEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
{ "new_wxContextMenuEvent", (PyCFunction) _wrap_new_wxContextMenuEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxHelpEvent_SetTarget", (PyCFunction) _wrap_wxHelpEvent_SetTarget, METH_VARARGS | METH_KEYWORDS },
{ "wxHelpEvent_GetTarget", (PyCFunction) _wrap_wxHelpEvent_GetTarget, METH_VARARGS | METH_KEYWORDS },
{ "wxHelpEvent_SetLink", (PyCFunction) _wrap_wxHelpEvent_SetLink, METH_VARARGS | METH_KEYWORDS },
@@ -1068,7 +932,6 @@ static PyMethodDef helpcMethods[] = {
* This table is used by the pointer type-checker
*/
static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxEvent","_wxContextMenuEvent",SwigwxContextMenuEventTowxEvent},
{ "_wxEvent","_wxHelpEvent",SwigwxHelpEventTowxEvent},
{ "_signed_long","_long",0},
{ "_wxPrintQuality","_wxCoord",0},
@@ -1099,7 +962,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_uint","_int",0},
{ "_uint","_wxWindowID",0},
{ "_wxChar","_char",0},
{ "_wxCommandEvent","_wxContextMenuEvent",SwigwxContextMenuEventTowxCommandEvent},
{ "_wxCommandEvent","_wxHelpEvent",SwigwxHelpEventTowxCommandEvent},
{ "_char","_wxChar",0},
{ "_wxHelpProvider","_wxSimpleHelpProvider",SwigwxSimpleHelpProviderTowxHelpProvider},
@@ -1123,7 +985,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_unsigned_short","_short",0},
{ "_wxObject","_wxContextHelpButton",SwigwxContextHelpButtonTowxObject},
{ "_wxObject","_wxContextHelp",SwigwxContextHelpTowxObject},
{ "_wxObject","_wxContextMenuEvent",SwigwxContextMenuEventTowxObject},
{ "_wxObject","_wxHelpEvent",SwigwxHelpEventTowxObject},
{ "_signed_short","_WXTYPE",0},
{ "_signed_short","_short",0},

22
wxPython/src/msw/help.py
View File

@@ -61,27 +61,6 @@ class wxHelpEvent(wxHelpEventPtr):
class wxContextMenuEventPtr(wxCommandEventPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def GetPosition(self, *_args, **_kwargs):
val = apply(helpc.wxContextMenuEvent_GetPosition,(self,) + _args, _kwargs)
if val: val = wxPointPtr(val)
return val
def SetPosition(self, *_args, **_kwargs):
val = apply(helpc.wxContextMenuEvent_SetPosition,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxContextMenuEvent instance at %s>" % (self.this,)
class wxContextMenuEvent(wxContextMenuEventPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(helpc.new_wxContextMenuEvent,_args,_kwargs)
self.thisown = 1
class wxContextHelpPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
@@ -192,4 +171,3 @@ wxEVT_DETAILED_HELP = helpc.wxEVT_DETAILED_HELP
# Stuff these names into the wx namespace so wxPyConstructObject can find them
import wx
wx.wxHelpEventPtr = wxHelpEventPtr
wx.wxContextMenuEventPtr = wxContextMenuEventPtr