wxPython stuff:
1. Added Clipboard and Drag-and-Drop classes 2. Added wxFontEnumerator 3. Many changes to wxMenu, wxMenubar 4. Various other changes and additions 5. Updates to the demo 6. Documentation updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -4863,6 +4863,102 @@ static PyObject *_wrap_wxTextCtrl_IsEditable(PyObject *self, PyObject *args, PyO
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxTextCtrl_Undo(_swigobj) (_swigobj->Undo())
|
||||
static PyObject *_wrap_wxTextCtrl_Undo(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxTextCtrl * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Undo",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Undo. Expected _wxTextCtrl_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
wxTextCtrl_Undo(_arg0);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxTextCtrl_Redo(_swigobj) (_swigobj->Redo())
|
||||
static PyObject *_wrap_wxTextCtrl_Redo(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxTextCtrl * _arg0;
|
||||
PyObject * _argo0 = 0;
|
||||
char *_kwnames[] = { "self", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Redo",_kwnames,&_argo0))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_Redo. Expected _wxTextCtrl_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
wxTextCtrl_Redo(_arg0);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static void wxTextCtrl_write(wxTextCtrl *self,const wxString & text) {
|
||||
self->AppendText(text + '\n');
|
||||
}
|
||||
static PyObject *_wrap_wxTextCtrl_write(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject * _resultobj;
|
||||
wxTextCtrl * _arg0;
|
||||
wxString * _arg1;
|
||||
PyObject * _argo0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
char *_kwnames[] = { "self","text", NULL };
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_write",_kwnames,&_argo0,&_obj1))
|
||||
return NULL;
|
||||
if (_argo0) {
|
||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_write. Expected _wxTextCtrl_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
if (!PyString_Check(_obj1)) {
|
||||
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
|
||||
return NULL;
|
||||
}
|
||||
_arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
wxTextCtrl_write(_arg0,*_arg1);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
{
|
||||
if (_obj1)
|
||||
delete _arg1;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static void *SwigwxScrollBarTowxControl(void *ptr) {
|
||||
wxScrollBar *src;
|
||||
wxControl *dest;
|
||||
@@ -6907,6 +7003,9 @@ static PyMethodDef controlscMethods[] = {
|
||||
{ "wxScrollBar_GetPageSize", (PyCFunction) _wrap_wxScrollBar_GetPageSize, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxScrollBar_GetRange", (PyCFunction) _wrap_wxScrollBar_GetRange, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "new_wxScrollBar", (PyCFunction) _wrap_new_wxScrollBar, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxTextCtrl_write", (PyCFunction) _wrap_wxTextCtrl_write, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxTextCtrl_Redo", (PyCFunction) _wrap_wxTextCtrl_Redo, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxTextCtrl_Undo", (PyCFunction) _wrap_wxTextCtrl_Undo, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxTextCtrl_IsEditable", (PyCFunction) _wrap_wxTextCtrl_IsEditable, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxTextCtrl_GetSelection", (PyCFunction) _wrap_wxTextCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
|
||||
{ "wxTextCtrl_CanUndo", (PyCFunction) _wrap_wxTextCtrl_CanUndo, METH_VARARGS | METH_KEYWORDS },
|
||||
@@ -7043,7 +7142,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxActivateEvent","_wxActivateEvent",0},
|
||||
{ "_signed_long","_long",0},
|
||||
{ "_wxMenuEvent","_class_wxMenuEvent",0},
|
||||
{ "_wxBitmapDataObject","_class_wxBitmapDataObject",0},
|
||||
{ "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
|
||||
{ "_wxPrintQuality","_wxCoord",0},
|
||||
{ "_wxPrintQuality","_int",0},
|
||||
{ "_wxPrintQuality","_signed_int",0},
|
||||
{ "_wxPrintQuality","_unsigned_int",0},
|
||||
@@ -7051,7 +7152,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPrintQuality","_uint",0},
|
||||
{ "_wxPrintQuality","_EBool",0},
|
||||
{ "_wxPrintQuality","_size_t",0},
|
||||
{ "_class_wxCustomDataObject","_wxCustomDataObject",0},
|
||||
{ "_class_wxRegionIterator","_wxRegionIterator",0},
|
||||
{ "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0},
|
||||
{ "_class_wxMenuBar","_wxMenuBar",0},
|
||||
{ "_class_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler},
|
||||
{ "_class_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler},
|
||||
@@ -7100,6 +7203,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPen","_class_wxPen",0},
|
||||
{ "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
|
||||
{ "_byte","_unsigned_char",0},
|
||||
{ "_wxDataObject","_class_wxDataObject",0},
|
||||
{ "_wxStaticBox","_class_wxStaticBox",0},
|
||||
{ "_wxChoice","_class_wxComboBox",SwigwxComboBoxTowxChoice},
|
||||
{ "_wxChoice","_wxComboBox",SwigwxComboBoxTowxChoice},
|
||||
@@ -7109,12 +7213,16 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_long","_unsigned_long",0},
|
||||
{ "_long","_signed_long",0},
|
||||
{ "_wxImageList","_class_wxImageList",0},
|
||||
{ "_wxDataObjectSimple","_class_wxDataObjectSimple",0},
|
||||
{ "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
|
||||
{ "_wxBitmapButton","_class_wxBitmapButton",0},
|
||||
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
|
||||
{ "_class_wxClipboard","_wxClipboard",0},
|
||||
{ "_class_wxGauge","_wxGauge",0},
|
||||
{ "_wxDC","_class_wxDC",0},
|
||||
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
|
||||
{ "_wxSpinEvent","_class_wxSpinEvent",0},
|
||||
{ "_size_t","_wxCoord",0},
|
||||
{ "_size_t","_wxPrintQuality",0},
|
||||
{ "_size_t","_unsigned_int",0},
|
||||
{ "_size_t","_int",0},
|
||||
@@ -7133,14 +7241,20 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxPyEvent","_class_wxPyEvent",0},
|
||||
{ "_wxTextCtrl","_class_wxTextCtrl",0},
|
||||
{ "_class_wxMask","_wxMask",0},
|
||||
{ "_wxTextDataObject","_class_wxTextDataObject",0},
|
||||
{ "_class_wxKeyEvent","_wxKeyEvent",0},
|
||||
{ "_wxColour","_class_wxColour",0},
|
||||
{ "_class_wxDialog","_wxDialog",0},
|
||||
{ "_class_wxFileDataObject","_wxFileDataObject",0},
|
||||
{ "_wxIdleEvent","_class_wxIdleEvent",0},
|
||||
{ "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
|
||||
{ "_class_wxDataObject","_wxDataObject",0},
|
||||
{ "_wxStaticLine","_class_wxStaticLine",0},
|
||||
{ "_wxBrush","_class_wxBrush",0},
|
||||
{ "_wxDataFormat","_class_wxDataFormat",0},
|
||||
{ "_class_wxDataObjectSimple","_wxDataObjectSimple",0},
|
||||
{ "_wxShowEvent","_class_wxShowEvent",0},
|
||||
{ "_uint","_wxCoord",0},
|
||||
{ "_uint","_wxPrintQuality",0},
|
||||
{ "_uint","_size_t",0},
|
||||
{ "_uint","_unsigned_int",0},
|
||||
@@ -7168,17 +7282,21 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxPyEvent","_wxPyEvent",0},
|
||||
{ "_class_wxIconizeEvent","_wxIconizeEvent",0},
|
||||
{ "_class_wxStaticBitmap","_wxStaticBitmap",0},
|
||||
{ "_wxDropTarget","_class_wxDropTarget",0},
|
||||
{ "_class_wxStaticLine","_wxStaticLine",0},
|
||||
{ "_wxScrollEvent","_class_wxScrollEvent",0},
|
||||
{ "_EBool","_wxCoord",0},
|
||||
{ "_EBool","_wxPrintQuality",0},
|
||||
{ "_EBool","_signed_int",0},
|
||||
{ "_EBool","_int",0},
|
||||
{ "_EBool","_wxWindowID",0},
|
||||
{ "_class_wxRegion","_wxRegion",0},
|
||||
{ "_class_wxDataFormat","_wxDataFormat",0},
|
||||
{ "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
|
||||
{ "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},
|
||||
{ "_wxStaticText","_class_wxStaticText",0},
|
||||
{ "_wxFont","_class_wxFont",0},
|
||||
{ "_class_wxPyDropTarget","_wxPyDropTarget",0},
|
||||
{ "_wxCloseEvent","_class_wxCloseEvent",0},
|
||||
{ "_unsigned_long","_wxDash",0},
|
||||
{ "_unsigned_long","_long",0},
|
||||
@@ -7196,6 +7314,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxCheckBox","_wxCheckBox",0},
|
||||
{ "_wxComboBox","_class_wxComboBox",0},
|
||||
{ "_wxRadioButton","_class_wxRadioButton",0},
|
||||
{ "_signed_int","_wxCoord",0},
|
||||
{ "_signed_int","_wxPrintQuality",0},
|
||||
{ "_signed_int","_EBool",0},
|
||||
{ "_signed_int","_wxWindowID",0},
|
||||
@@ -7203,6 +7322,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxTextCtrl","_wxTextCtrl",0},
|
||||
{ "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
|
||||
{ "_wxMetaFileDC","_class_wxMetaFileDC",0},
|
||||
{ "_class_wxTextDataObject","_wxTextDataObject",0},
|
||||
{ "_wxMenu","_class_wxMenu",0},
|
||||
{ "_class_wxMoveEvent","_wxMoveEvent",0},
|
||||
{ "_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox},
|
||||
@@ -7212,6 +7332,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_WXTYPE","_short",0},
|
||||
{ "_WXTYPE","_signed_short",0},
|
||||
{ "_WXTYPE","_unsigned_short",0},
|
||||
{ "_class_wxDropTarget","_wxDropTarget",0},
|
||||
{ "_class_wxBrush","_wxBrush",0},
|
||||
{ "_unsigned_short","_WXTYPE",0},
|
||||
{ "_unsigned_short","_short",0},
|
||||
@@ -7256,6 +7377,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxWindow","_wxWindow",0},
|
||||
{ "_class_wxStaticText","_wxStaticText",0},
|
||||
{ "_class_wxFont","_wxFont",0},
|
||||
{ "_wxClipboard","_class_wxClipboard",0},
|
||||
{ "_class_wxPyValidator","_wxPyValidator",0},
|
||||
{ "_class_wxCloseEvent","_wxCloseEvent",0},
|
||||
{ "_wxBusyInfo","_class_wxBusyInfo",0},
|
||||
@@ -7275,9 +7397,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
|
||||
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
|
||||
{ "_class_wxCursor","_wxCursor",0},
|
||||
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
|
||||
{ "_wxScrolledWindow","_class_wxScrolledWindow",0},
|
||||
{ "_unsigned_char","_byte",0},
|
||||
{ "_class_wxMetaFileDC","_wxMetaFileDC",0},
|
||||
{ "_wxDropSource","_class_wxDropSource",0},
|
||||
{ "_class_wxMenu","_wxMenu",0},
|
||||
{ "_wxControl","_class_wxSlider",SwigwxSliderTowxControl},
|
||||
{ "_wxControl","_wxSlider",SwigwxSliderTowxControl},
|
||||
@@ -7319,6 +7443,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox},
|
||||
{ "_class_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox},
|
||||
{ "_class_wxListBox","_wxListBox",0},
|
||||
{ "_unsigned_int","_wxCoord",0},
|
||||
{ "_unsigned_int","_wxPrintQuality",0},
|
||||
{ "_unsigned_int","_size_t",0},
|
||||
{ "_unsigned_int","_uint",0},
|
||||
@@ -7340,6 +7465,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxImageList","_wxImageList",0},
|
||||
{ "_class_wxBitmapButton","_wxBitmapButton",0},
|
||||
{ "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
|
||||
{ "_wxWindowID","_wxCoord",0},
|
||||
{ "_wxWindowID","_wxPrintQuality",0},
|
||||
{ "_wxWindowID","_size_t",0},
|
||||
{ "_wxWindowID","_EBool",0},
|
||||
@@ -7348,6 +7474,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxWindowID","_signed_int",0},
|
||||
{ "_wxWindowID","_unsigned_int",0},
|
||||
{ "_class_wxScrollWinEvent","_wxScrollWinEvent",0},
|
||||
{ "_int","_wxCoord",0},
|
||||
{ "_int","_wxPrintQuality",0},
|
||||
{ "_int","_size_t",0},
|
||||
{ "_int","_EBool",0},
|
||||
@@ -7368,11 +7495,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxPrinterDC","_wxPrinterDC",0},
|
||||
{ "_class_wxPaintDC","_wxPaintDC",0},
|
||||
{ "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
|
||||
{ "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0},
|
||||
{ "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
|
||||
{ "_class_wxComboBox","_wxComboBox",0},
|
||||
{ "_class_wxRadioButton","_wxRadioButton",0},
|
||||
{ "_wxValidator","_class_wxValidator",0},
|
||||
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
|
||||
{ "_class_wxDropSource","_wxDropSource",0},
|
||||
{ "_wxIconizeEvent","_class_wxIconizeEvent",0},
|
||||
{ "_class_wxControl","_class_wxSlider",SwigwxSliderTowxControl},
|
||||
{ "_class_wxControl","_wxSlider",SwigwxSliderTowxControl},
|
||||
@@ -7417,10 +7546,20 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxScreenDC","_wxScreenDC",0},
|
||||
{ "_wxPalette","_class_wxPalette",0},
|
||||
{ "_class_wxIdleEvent","_wxIdleEvent",0},
|
||||
{ "_wxCoord","_int",0},
|
||||
{ "_wxCoord","_signed_int",0},
|
||||
{ "_wxCoord","_unsigned_int",0},
|
||||
{ "_wxCoord","_wxWindowID",0},
|
||||
{ "_wxCoord","_uint",0},
|
||||
{ "_wxCoord","_EBool",0},
|
||||
{ "_wxCoord","_size_t",0},
|
||||
{ "_wxCoord","_wxPrintQuality",0},
|
||||
{ "_wxEraseEvent","_class_wxEraseEvent",0},
|
||||
{ "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
|
||||
{ "_class_wxJoystickEvent","_wxJoystickEvent",0},
|
||||
{ "_wxRegion","_class_wxRegion",0},
|
||||
{ "_class_wxShowEvent","_wxShowEvent",0},
|
||||
{ "_wxPyDropTarget","_class_wxPyDropTarget",0},
|
||||
{ "_wxActivateEvent","_class_wxActivateEvent",0},
|
||||
{ "_wxGauge","_class_wxGauge",0},
|
||||
{ "_class_wxCheckListBox","_wxCheckListBox",0},
|
||||
@@ -7428,9 +7567,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_class_wxCommandEvent","_wxCommandEvent",0},
|
||||
{ "_class_wxClientDC","_wxClientDC",0},
|
||||
{ "_class_wxSizeEvent","_wxSizeEvent",0},
|
||||
{ "_wxCustomDataObject","_class_wxCustomDataObject",0},
|
||||
{ "_class_wxSize","_wxSize",0},
|
||||
{ "_class_wxBitmap","_wxBitmap",0},
|
||||
{ "_class_wxMemoryDC","_wxMemoryDC",0},
|
||||
{ "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0},
|
||||
{ "_wxMenuBar","_class_wxMenuBar",0},
|
||||
{ "_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler},
|
||||
{ "_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler},
|
||||
@@ -7479,7 +7620,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
|
||||
{ "_wxKeyEvent","_class_wxKeyEvent",0},
|
||||
{ "_wxMoveEvent","_class_wxMoveEvent",0},
|
||||
{ "_class_wxPalette","_wxPalette",0},
|
||||
{ "_wxFileDataObject","_class_wxFileDataObject",0},
|
||||
{ "_class_wxEraseEvent","_wxEraseEvent",0},
|
||||
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
|
||||
{ "_wxWindow","_class_wxSlider",SwigwxSliderTowxWindow},
|
||||
{ "_wxWindow","_wxSlider",SwigwxSliderTowxWindow},
|
||||
{ "_wxWindow","_class_wxRadioButton",SwigwxRadioButtonTowxWindow},
|
||||
|
Reference in New Issue
Block a user