Added wxDynamicSashWindow to wxPython, plus other odds and ends.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -184,7 +184,6 @@ enum {
|
||||
wxBORDER,
|
||||
wxSIMPLE_BORDER,
|
||||
wxSTATIC_BORDER,
|
||||
wxBORDER_MASK,
|
||||
wxTRANSPARENT_WINDOW,
|
||||
wxNO_BORDER,
|
||||
wxUSER_COLOURS,
|
||||
@@ -489,6 +488,19 @@ enum {
|
||||
};
|
||||
|
||||
|
||||
enum wxBorder
|
||||
{
|
||||
wxBORDER_DEFAULT,
|
||||
wxBORDER_NONE,
|
||||
wxBORDER_STATIC,
|
||||
wxBORDER_SIMPLE,
|
||||
wxBORDER_RAISED,
|
||||
wxBORDER_SUNKEN,
|
||||
wxBORDER_DOUBLE,
|
||||
wxBORDER_MASK,
|
||||
};
|
||||
|
||||
|
||||
// // Standard error codes
|
||||
// enum ErrCode
|
||||
// {
|
||||
|
@@ -756,6 +756,9 @@ public:
|
||||
int GetThumbPosition();
|
||||
int GetThumbSize();
|
||||
%name(GetThumbLength) int GetThumbSize(); // to match the docs
|
||||
|
||||
bool IsVertical();
|
||||
|
||||
void SetThumbPosition(int viewStart);
|
||||
void SetScrollbar(int position, int thumbSize,
|
||||
int range, int pageSize,
|
||||
|
@@ -332,16 +332,15 @@ public:
|
||||
wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
|
||||
|
||||
int m_code;
|
||||
long m_oldItemIndex;
|
||||
long m_itemIndex;
|
||||
int m_col;
|
||||
bool m_cancelled;
|
||||
wxPoint m_pointDrag;
|
||||
wxListItem m_item;
|
||||
|
||||
int GetCode();
|
||||
long GetIndex();
|
||||
int GetColumn();
|
||||
bool Cancelled();
|
||||
wxPoint GetPoint();
|
||||
const wxString& GetLabel();
|
||||
const wxString& GetText();
|
||||
|
@@ -35,7 +35,7 @@ int wxNewEventType();
|
||||
|
||||
class wxEvent : public wxObject {
|
||||
public:
|
||||
wxEvent(int id = 0);
|
||||
// wxEvent(int id = 0); // *** This class is now an ABC
|
||||
~wxEvent();
|
||||
|
||||
wxObject* GetEventObject();
|
||||
|
@@ -7932,6 +7932,34 @@ static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args,
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxScrollBar_IsVertical(_swigobj) (_swigobj->IsVertical())
|
||||
static PyObject *_wrap_wxScrollBar_IsVertical(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
bool _result;
|
||||
wxScrollBar * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollBar_IsVertical",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxScrollBar_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_IsVertical. Expected _wxScrollBar_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = (bool )wxScrollBar_IsVertical(_arg0);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} _resultobj = Py_BuildValue("i",_result);
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxScrollBar_SetThumbPosition(_swigobj,_swigarg0) (_swigobj->SetThumbPosition(_swigarg0))
|
||||
static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -11175,6 +11203,7 @@ static PyMethodDef controlscMethods[] = {
|
||||
{ "new_wxSpinButton", (PyCFunction) _wrap_new_wxSpinButton, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxScrollBar_SetScrollbar", (PyCFunction) _wrap_wxScrollBar_SetScrollbar, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxScrollBar_SetThumbPosition", (PyCFunction) _wrap_wxScrollBar_SetThumbPosition, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxScrollBar_IsVertical", (PyCFunction) _wrap_wxScrollBar_IsVertical, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxScrollBar_GetThumbLength", (PyCFunction) _wrap_wxScrollBar_GetThumbSize, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxScrollBar_GetThumbSize", (PyCFunction) _wrap_wxScrollBar_GetThumbSize, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxScrollBar_GetThumbPosition", (PyCFunction) _wrap_wxScrollBar_GetThumbPosition, METH_VARARGS | METH_KEYWORDS },
|
||||
|
@@ -777,6 +777,9 @@ class wxScrollBarPtr(wxControlPtr):
|
||||
def GetThumbLength(self, *_args, **_kwargs):
|
||||
val = apply(controlsc.wxScrollBar_GetThumbLength,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def IsVertical(self, *_args, **_kwargs):
|
||||
val = apply(controlsc.wxScrollBar_IsVertical,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def SetThumbPosition(self, *_args, **_kwargs):
|
||||
val = apply(controlsc.wxScrollBar_SetThumbPosition,(self,) + _args, _kwargs)
|
||||
return val
|
||||
|
@@ -2240,6 +2240,63 @@ static PyObject *_wrap_wxListEvent_m_code_get(PyObject *self, PyObject *args, Py
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxListEvent_m_oldItemIndex_set(_swigobj,_swigval) (_swigobj->m_oldItemIndex = _swigval,_swigval)
|
||||
static PyObject *_wrap_wxListEvent_m_oldItemIndex_set(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
long _result;
|
||||
wxListEvent * _arg0;
|
||||
long _arg1;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self","m_oldItemIndex", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListEvent_m_oldItemIndex_set",_kwnames,&_argo0,&_arg1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_oldItemIndex_set. Expected _wxListEvent_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = (long )wxListEvent_m_oldItemIndex_set(_arg0,_arg1);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} _resultobj = Py_BuildValue("l",_result);
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxListEvent_m_oldItemIndex_get(_swigobj) ((long ) _swigobj->m_oldItemIndex)
|
||||
static PyObject *_wrap_wxListEvent_m_oldItemIndex_get(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
long _result;
|
||||
wxListEvent * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_m_oldItemIndex_get",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_oldItemIndex_get. Expected _wxListEvent_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = (long )wxListEvent_m_oldItemIndex_get(_arg0);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} _resultobj = Py_BuildValue("l",_result);
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxListEvent_m_itemIndex_set(_swigobj,_swigval) (_swigobj->m_itemIndex = _swigval,_swigval)
|
||||
static PyObject *_wrap_wxListEvent_m_itemIndex_set(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -2354,65 +2411,6 @@ static PyObject *_wrap_wxListEvent_m_col_get(PyObject *self, PyObject *args, PyO
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxListEvent_m_cancelled_set(_swigobj,_swigval) (_swigobj->m_cancelled = _swigval,_swigval)
|
||||
static PyObject *_wrap_wxListEvent_m_cancelled_set(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
bool _result;
|
||||
wxListEvent * _arg0;
|
||||
bool _arg1;
|
||||
PyObject * _argo0 = 0;
|
||||
int tempbool1;
|
||||
char *_kwnames[] = { "self","m_cancelled", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListEvent_m_cancelled_set",_kwnames,&_argo0,&tempbool1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_cancelled_set. Expected _wxListEvent_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
_arg1 = (bool ) tempbool1;
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = (bool )wxListEvent_m_cancelled_set(_arg0,_arg1);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} _resultobj = Py_BuildValue("i",_result);
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxListEvent_m_cancelled_get(_swigobj) ((bool ) _swigobj->m_cancelled)
|
||||
static PyObject *_wrap_wxListEvent_m_cancelled_get(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
bool _result;
|
||||
wxListEvent * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_m_cancelled_get",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_cancelled_get. Expected _wxListEvent_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = (bool )wxListEvent_m_cancelled_get(_arg0);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} _resultobj = Py_BuildValue("i",_result);
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxListEvent_m_pointDrag_set(_swigobj,_swigval) (_swigobj->m_pointDrag = *(_swigval),_swigval)
|
||||
static PyObject *_wrap_wxListEvent_m_pointDrag_set(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -2640,34 +2638,6 @@ static PyObject *_wrap_wxListEvent_GetColumn(PyObject *self, PyObject *args, PyO
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxListEvent_Cancelled(_swigobj) (_swigobj->Cancelled())
|
||||
static PyObject *_wrap_wxListEvent_Cancelled(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
bool _result;
|
||||
wxListEvent * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_Cancelled",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxListEvent_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_Cancelled. Expected _wxListEvent_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = (bool )wxListEvent_Cancelled(_arg0);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} _resultobj = Py_BuildValue("i",_result);
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxListEvent_GetPoint(_swigobj) (_swigobj->GetPoint())
|
||||
static PyObject *_wrap_wxListEvent_GetPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -9752,7 +9722,6 @@ static PyMethodDef controls2cMethods[] = {
|
||||
{ "wxListEvent_GetText", (PyCFunction) _wrap_wxListEvent_GetText, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_GetLabel", (PyCFunction) _wrap_wxListEvent_GetLabel, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_GetPoint", (PyCFunction) _wrap_wxListEvent_GetPoint, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_Cancelled", (PyCFunction) _wrap_wxListEvent_Cancelled, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_GetColumn", (PyCFunction) _wrap_wxListEvent_GetColumn, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_GetIndex", (PyCFunction) _wrap_wxListEvent_GetIndex, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_GetCode", (PyCFunction) _wrap_wxListEvent_GetCode, METH_VARARGS | METH_KEYWORDS },
|
||||
@@ -9760,12 +9729,12 @@ static PyMethodDef controls2cMethods[] = {
|
||||
{ "wxListEvent_m_item_set", (PyCFunction) _wrap_wxListEvent_m_item_set, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_pointDrag_get", (PyCFunction) _wrap_wxListEvent_m_pointDrag_get, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_pointDrag_set", (PyCFunction) _wrap_wxListEvent_m_pointDrag_set, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_cancelled_get", (PyCFunction) _wrap_wxListEvent_m_cancelled_get, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_cancelled_set", (PyCFunction) _wrap_wxListEvent_m_cancelled_set, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_col_get", (PyCFunction) _wrap_wxListEvent_m_col_get, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_col_set", (PyCFunction) _wrap_wxListEvent_m_col_set, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_itemIndex_get", (PyCFunction) _wrap_wxListEvent_m_itemIndex_get, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_itemIndex_set", (PyCFunction) _wrap_wxListEvent_m_itemIndex_set, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_oldItemIndex_get", (PyCFunction) _wrap_wxListEvent_m_oldItemIndex_get, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_oldItemIndex_set", (PyCFunction) _wrap_wxListEvent_m_oldItemIndex_set, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_code_get", (PyCFunction) _wrap_wxListEvent_m_code_get, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxListEvent_m_code_set", (PyCFunction) _wrap_wxListEvent_m_code_set, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "new_wxListEvent", (PyCFunction) _wrap_new_wxListEvent, METH_VARARGS | METH_KEYWORDS },
|
||||
|
@@ -355,9 +355,6 @@ class wxListEventPtr(wxNotifyEventPtr):
|
||||
def GetColumn(self, *_args, **_kwargs):
|
||||
val = apply(controls2c.wxListEvent_GetColumn,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def Cancelled(self, *_args, **_kwargs):
|
||||
val = apply(controls2c.wxListEvent_Cancelled,(self,) + _args, _kwargs)
|
||||
return val
|
||||
def GetPoint(self, *_args, **_kwargs):
|
||||
val = apply(controls2c.wxListEvent_GetPoint,(self,) + _args, _kwargs)
|
||||
if val: val = wxPointPtr(val) ; val.thisown = 1
|
||||
@@ -390,15 +387,15 @@ class wxListEventPtr(wxNotifyEventPtr):
|
||||
if name == "m_code" :
|
||||
controls2c.wxListEvent_m_code_set(self,value)
|
||||
return
|
||||
if name == "m_oldItemIndex" :
|
||||
controls2c.wxListEvent_m_oldItemIndex_set(self,value)
|
||||
return
|
||||
if name == "m_itemIndex" :
|
||||
controls2c.wxListEvent_m_itemIndex_set(self,value)
|
||||
return
|
||||
if name == "m_col" :
|
||||
controls2c.wxListEvent_m_col_set(self,value)
|
||||
return
|
||||
if name == "m_cancelled" :
|
||||
controls2c.wxListEvent_m_cancelled_set(self,value)
|
||||
return
|
||||
if name == "m_pointDrag" :
|
||||
controls2c.wxListEvent_m_pointDrag_set(self,value.this)
|
||||
return
|
||||
@@ -409,12 +406,12 @@ class wxListEventPtr(wxNotifyEventPtr):
|
||||
def __getattr__(self,name):
|
||||
if name == "m_code" :
|
||||
return controls2c.wxListEvent_m_code_get(self)
|
||||
if name == "m_oldItemIndex" :
|
||||
return controls2c.wxListEvent_m_oldItemIndex_get(self)
|
||||
if name == "m_itemIndex" :
|
||||
return controls2c.wxListEvent_m_itemIndex_get(self)
|
||||
if name == "m_col" :
|
||||
return controls2c.wxListEvent_m_col_get(self)
|
||||
if name == "m_cancelled" :
|
||||
return controls2c.wxListEvent_m_cancelled_get(self)
|
||||
if name == "m_pointDrag" :
|
||||
return wxPointPtr(controls2c.wxListEvent_m_pointDrag_get(self))
|
||||
if name == "m_item" :
|
||||
|
@@ -119,33 +119,6 @@ static void *SwigwxEventTowxObject(void *ptr) {
|
||||
return (void *) dest;
|
||||
}
|
||||
|
||||
#define new_wxEvent(_swigarg0) (new wxEvent(_swigarg0))
|
||||
static PyObject *_wrap_new_wxEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxEvent * _result;
|
||||
int _arg0 = (int ) 0;
|
||||
char *_kwnames[] = { "id", NULL };
|
||||
char _ptemp[128];
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|i:new_wxEvent",_kwnames,&_arg0))
|
||||
return NULL;
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = (wxEvent *)new_wxEvent(_arg0);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
if (PyErr_Occurred()) return NULL;
|
||||
} if (_result) {
|
||||
SWIG_MakePtr(_ptemp, (char *) _result,"_wxEvent_p");
|
||||
_resultobj = Py_BuildValue("s",_ptemp);
|
||||
} else {
|
||||
Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define delete_wxEvent(_swigobj) (delete _swigobj)
|
||||
static PyObject *_wrap_delete_wxEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
@@ -7226,7 +7199,6 @@ static PyMethodDef eventscMethods[] = {
|
||||
{ "wxEvent_GetEventType", (PyCFunction) _wrap_wxEvent_GetEventType, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxEvent_GetEventObject", (PyCFunction) _wrap_wxEvent_GetEventObject, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "delete_wxEvent", (PyCFunction) _wrap_delete_wxEvent, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "new_wxEvent", (PyCFunction) _wrap_new_wxEvent, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxNewEventType", (PyCFunction) _wrap_wxNewEventType, METH_VARARGS | METH_KEYWORDS },
|
||||
{ NULL, NULL }
|
||||
};
|
||||
|
@@ -48,9 +48,8 @@ class wxEventPtr(wxObjectPtr):
|
||||
def __repr__(self):
|
||||
return "<C wxEvent instance at %s>" % (self.this,)
|
||||
class wxEvent(wxEventPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = apply(eventsc.new_wxEvent,_args,_kwargs)
|
||||
self.thisown = 1
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
|
||||
|
||||
|
||||
|
@@ -1908,7 +1908,6 @@ SWIGEXPORT(void) initwxc() {
|
||||
PyDict_SetItemString(d,"wxBORDER", PyInt_FromLong((long) wxBORDER));
|
||||
PyDict_SetItemString(d,"wxSIMPLE_BORDER", PyInt_FromLong((long) wxSIMPLE_BORDER));
|
||||
PyDict_SetItemString(d,"wxSTATIC_BORDER", PyInt_FromLong((long) wxSTATIC_BORDER));
|
||||
PyDict_SetItemString(d,"wxBORDER_MASK", PyInt_FromLong((long) wxBORDER_MASK));
|
||||
PyDict_SetItemString(d,"wxTRANSPARENT_WINDOW", PyInt_FromLong((long) wxTRANSPARENT_WINDOW));
|
||||
PyDict_SetItemString(d,"wxNO_BORDER", PyInt_FromLong((long) wxNO_BORDER));
|
||||
PyDict_SetItemString(d,"wxUSER_COLOURS", PyInt_FromLong((long) wxUSER_COLOURS));
|
||||
@@ -2183,6 +2182,14 @@ SWIGEXPORT(void) initwxc() {
|
||||
PyDict_SetItemString(d,"wxMM_ANISOTROPIC", PyInt_FromLong((long) wxMM_ANISOTROPIC));
|
||||
PyDict_SetItemString(d,"wxMM_POINTS", PyInt_FromLong((long) wxMM_POINTS));
|
||||
PyDict_SetItemString(d,"wxMM_METRIC", PyInt_FromLong((long) wxMM_METRIC));
|
||||
PyDict_SetItemString(d,"wxBORDER_DEFAULT", PyInt_FromLong((long) wxBORDER_DEFAULT));
|
||||
PyDict_SetItemString(d,"wxBORDER_NONE", PyInt_FromLong((long) wxBORDER_NONE));
|
||||
PyDict_SetItemString(d,"wxBORDER_STATIC", PyInt_FromLong((long) wxBORDER_STATIC));
|
||||
PyDict_SetItemString(d,"wxBORDER_SIMPLE", PyInt_FromLong((long) wxBORDER_SIMPLE));
|
||||
PyDict_SetItemString(d,"wxBORDER_RAISED", PyInt_FromLong((long) wxBORDER_RAISED));
|
||||
PyDict_SetItemString(d,"wxBORDER_SUNKEN", PyInt_FromLong((long) wxBORDER_SUNKEN));
|
||||
PyDict_SetItemString(d,"wxBORDER_DOUBLE", PyInt_FromLong((long) wxBORDER_DOUBLE));
|
||||
PyDict_SetItemString(d,"wxBORDER_MASK", PyInt_FromLong((long) wxBORDER_MASK));
|
||||
PyDict_SetItemString(d,"wxDEFAULT", PyInt_FromLong((long) wxDEFAULT));
|
||||
PyDict_SetItemString(d,"wxDECORATIVE", PyInt_FromLong((long) wxDECORATIVE));
|
||||
PyDict_SetItemString(d,"wxROMAN", PyInt_FromLong((long) wxROMAN));
|
||||
|
@@ -173,7 +173,6 @@ wxRAISED_BORDER = wxc.wxRAISED_BORDER
|
||||
wxBORDER = wxc.wxBORDER
|
||||
wxSIMPLE_BORDER = wxc.wxSIMPLE_BORDER
|
||||
wxSTATIC_BORDER = wxc.wxSTATIC_BORDER
|
||||
wxBORDER_MASK = wxc.wxBORDER_MASK
|
||||
wxTRANSPARENT_WINDOW = wxc.wxTRANSPARENT_WINDOW
|
||||
wxNO_BORDER = wxc.wxNO_BORDER
|
||||
wxUSER_COLOURS = wxc.wxUSER_COLOURS
|
||||
@@ -448,6 +447,14 @@ wxMM_ISOTROPIC = wxc.wxMM_ISOTROPIC
|
||||
wxMM_ANISOTROPIC = wxc.wxMM_ANISOTROPIC
|
||||
wxMM_POINTS = wxc.wxMM_POINTS
|
||||
wxMM_METRIC = wxc.wxMM_METRIC
|
||||
wxBORDER_DEFAULT = wxc.wxBORDER_DEFAULT
|
||||
wxBORDER_NONE = wxc.wxBORDER_NONE
|
||||
wxBORDER_STATIC = wxc.wxBORDER_STATIC
|
||||
wxBORDER_SIMPLE = wxc.wxBORDER_SIMPLE
|
||||
wxBORDER_RAISED = wxc.wxBORDER_RAISED
|
||||
wxBORDER_SUNKEN = wxc.wxBORDER_SUNKEN
|
||||
wxBORDER_DOUBLE = wxc.wxBORDER_DOUBLE
|
||||
wxBORDER_MASK = wxc.wxBORDER_MASK
|
||||
wxDEFAULT = wxc.wxDEFAULT
|
||||
wxDECORATIVE = wxc.wxDECORATIVE
|
||||
wxROMAN = wxc.wxROMAN
|
||||
|
Reference in New Issue
Block a user