wxPython 2.1b1 for wxMSW (wxGTK coming soon)
Lots of changes, see the README.txt for details... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -66,8 +66,10 @@ extern PyObject *SWIG_newvarlink(void);
|
||||
|
||||
#ifdef __WXGTK__
|
||||
#include <wx/checklst.h>
|
||||
#include <wx/statline.h>
|
||||
#endif
|
||||
|
||||
|
||||
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
|
||||
PyObject* o2;
|
||||
if (!target) {
|
||||
@@ -1269,6 +1271,14 @@ static PyObject *_wrap_wxChoice_SetStringSelection(PyObject *self, PyObject *arg
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
static void *SwigwxComboBoxTowxChoice(void *ptr) {
|
||||
wxComboBox *src;
|
||||
wxChoice *dest;
|
||||
src = (wxComboBox *) ptr;
|
||||
dest = (wxChoice *) src;
|
||||
return (void *) dest;
|
||||
}
|
||||
|
||||
static void *SwigwxComboBoxTowxControl(void *ptr) {
|
||||
wxComboBox *src;
|
||||
wxControl *dest;
|
||||
@@ -1880,35 +1890,6 @@ static PyObject *_wrap_wxComboBox_SetInsertionPointEnd(PyObject *self, PyObject
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxComboBox_SetSelection(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetSelection(_swigarg0,_swigarg1))
|
||||
static PyObject *_wrap_wxComboBox_SetSelection(PyObject *self, PyObject *args) {
|
||||
PyObject * _resultobj;
|
||||
wxComboBox * _arg0;
|
||||
int _arg1;
|
||||
bool _arg2 = (1);
|
||||
char * _argc0 = 0;
|
||||
int tempbool2;
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTuple(args,"si|i:wxComboBox_SetSelection",&_argc0,&_arg1,&tempbool2))
|
||||
return NULL;
|
||||
if (_argc0) {
|
||||
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxComboBox_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxComboBox_SetSelection. Expected _wxComboBox_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
_arg2 = (bool ) tempbool2;
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
wxComboBox_SetSelection(_arg0,_arg1,_arg2);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxComboBox_SetMark(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetSelection(_swigarg0,_swigarg1))
|
||||
static PyObject *_wrap_wxComboBox_SetMark(PyObject *self, PyObject *args) {
|
||||
PyObject * _resultobj;
|
||||
@@ -5150,36 +5131,6 @@ static PyObject *_wrap_wxRadioBox_FindString(PyObject *self, PyObject *args) {
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxRadioBox_GetLabel(_swigobj) (_swigobj->GetLabel())
|
||||
static PyObject *_wrap_wxRadioBox_GetLabel(PyObject *self, PyObject *args) {
|
||||
PyObject * _resultobj;
|
||||
wxString * _result;
|
||||
wxRadioBox * _arg0;
|
||||
char * _argc0 = 0;
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTuple(args,"s:wxRadioBox_GetLabel",&_argc0))
|
||||
return NULL;
|
||||
if (_argc0) {
|
||||
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_GetLabel. Expected _wxRadioBox_p.");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
{
|
||||
wxPy_BEGIN_ALLOW_THREADS;
|
||||
_result = new wxString (wxRadioBox_GetLabel(_arg0));
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
}{
|
||||
_resultobj = PyString_FromString(WXSTRINGCAST *(_result));
|
||||
}
|
||||
{
|
||||
delete _result;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxRadioBox_GetItemLabel(_swigobj,_swigarg0) (_swigobj->GetLabel(_swigarg0))
|
||||
static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args) {
|
||||
PyObject * _resultobj;
|
||||
@@ -5322,44 +5273,6 @@ static PyObject *_wrap_wxRadioBox_Number(PyObject *self, PyObject *args) {
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxRadioBox_SetLabel(_swigobj,_swigarg0) (_swigobj->SetLabel(_swigarg0))
|
||||
static PyObject *_wrap_wxRadioBox_SetLabel(PyObject *self, PyObject *args) {
|
||||
PyObject * _resultobj;
|
||||
wxRadioBox * _arg0;
|
||||
wxString * _arg1;
|
||||
char * _argc0 = 0;
|
||||
PyObject * _obj1 = 0;
|
||||
|
||||
self = self;
|
||||
if(!PyArg_ParseTuple(args,"sO:wxRadioBox_SetLabel",&_argc0,&_obj1))
|
||||
return NULL;
|
||||
if (_argc0) {
|
||||
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRadioBox_p")) {
|
||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRadioBox_SetLabel. Expected _wxRadioBox_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;
|
||||
wxRadioBox_SetLabel(_arg0,*_arg1);
|
||||
|
||||
wxPy_END_ALLOW_THREADS;
|
||||
} Py_INCREF(Py_None);
|
||||
_resultobj = Py_None;
|
||||
{
|
||||
if (_obj1)
|
||||
delete _arg1;
|
||||
}
|
||||
return _resultobj;
|
||||
}
|
||||
|
||||
#define wxRadioBox_SetItemLabel(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetLabel(_swigarg0,_swigarg1))
|
||||
static PyObject *_wrap_wxRadioBox_SetItemLabel(PyObject *self, PyObject *args) {
|
||||
PyObject * _resultobj;
|
||||
@@ -6260,13 +6173,11 @@ static PyMethodDef controlscMethods[] = {
|
||||
{ "wxRadioBox_SetStringSelection", _wrap_wxRadioBox_SetStringSelection, 1 },
|
||||
{ "wxRadioBox_SetSelection", _wrap_wxRadioBox_SetSelection, 1 },
|
||||
{ "wxRadioBox_SetItemLabel", _wrap_wxRadioBox_SetItemLabel, 1 },
|
||||
{ "wxRadioBox_SetLabel", _wrap_wxRadioBox_SetLabel, 1 },
|
||||
{ "wxRadioBox_Number", _wrap_wxRadioBox_Number, 1 },
|
||||
{ "wxRadioBox_GetStringSelection", _wrap_wxRadioBox_GetStringSelection, 1 },
|
||||
{ "wxRadioBox_GetString", _wrap_wxRadioBox_GetString, 1 },
|
||||
{ "wxRadioBox_GetSelection", _wrap_wxRadioBox_GetSelection, 1 },
|
||||
{ "wxRadioBox_GetItemLabel", _wrap_wxRadioBox_GetItemLabel, 1 },
|
||||
{ "wxRadioBox_GetLabel", _wrap_wxRadioBox_GetLabel, 1 },
|
||||
{ "wxRadioBox_FindString", _wrap_wxRadioBox_FindString, 1 },
|
||||
{ "wxRadioBox_EnableItem", _wrap_wxRadioBox_EnableItem, 1 },
|
||||
{ "wxRadioBox_Enable", _wrap_wxRadioBox_Enable, 1 },
|
||||
@@ -6358,7 +6269,6 @@ static PyMethodDef controlscMethods[] = {
|
||||
{ "new_wxGauge", _wrap_new_wxGauge, 1 },
|
||||
{ "wxComboBox_SetValue", _wrap_wxComboBox_SetValue, 1 },
|
||||
{ "wxComboBox_SetMark", _wrap_wxComboBox_SetMark, 1 },
|
||||
{ "wxComboBox_SetSelection", _wrap_wxComboBox_SetSelection, 1 },
|
||||
{ "wxComboBox_SetInsertionPointEnd", _wrap_wxComboBox_SetInsertionPointEnd, 1 },
|
||||
{ "wxComboBox_SetInsertionPoint", _wrap_wxComboBox_SetInsertionPoint, 1 },
|
||||
{ "wxComboBox_Remove", _wrap_wxComboBox_Remove, 1 },
|
||||
@@ -6427,6 +6337,13 @@ SWIGEXPORT(void,initcontrolsc)() {
|
||||
SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
|
||||
SWIG_RegisterMapping("_signed_long","_long",0);
|
||||
SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
|
||||
SWIG_RegisterMapping("_wxPrintQuality","_int",0);
|
||||
SWIG_RegisterMapping("_wxPrintQuality","_signed_int",0);
|
||||
SWIG_RegisterMapping("_wxPrintQuality","_unsigned_int",0);
|
||||
SWIG_RegisterMapping("_wxPrintQuality","_wxWindowID",0);
|
||||
SWIG_RegisterMapping("_wxPrintQuality","_uint",0);
|
||||
SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
|
||||
SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
|
||||
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
|
||||
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
|
||||
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler);
|
||||
@@ -6469,6 +6386,7 @@ SWIGEXPORT(void,initcontrolsc)() {
|
||||
SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
|
||||
SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
|
||||
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
|
||||
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
|
||||
SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
|
||||
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
|
||||
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
|
||||
@@ -6476,6 +6394,8 @@ SWIGEXPORT(void,initcontrolsc)() {
|
||||
SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
|
||||
SWIG_RegisterMapping("_byte","_unsigned_char",0);
|
||||
SWIG_RegisterMapping("_wxStaticBox","_class_wxStaticBox",0);
|
||||
SWIG_RegisterMapping("_wxChoice","_class_wxComboBox",SwigwxComboBoxTowxChoice);
|
||||
SWIG_RegisterMapping("_wxChoice","_wxComboBox",SwigwxComboBoxTowxChoice);
|
||||
SWIG_RegisterMapping("_wxChoice","_class_wxChoice",0);
|
||||
SWIG_RegisterMapping("_wxSlider","_class_wxSlider",0);
|
||||
SWIG_RegisterMapping("_long","_wxDash",0);
|
||||
@@ -6488,6 +6408,7 @@ SWIGEXPORT(void,initcontrolsc)() {
|
||||
SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0);
|
||||
SWIG_RegisterMapping("_wxDC","_class_wxDC",0);
|
||||
SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0);
|
||||
SWIG_RegisterMapping("_size_t","_wxPrintQuality",0);
|
||||
SWIG_RegisterMapping("_size_t","_unsigned_int",0);
|
||||
SWIG_RegisterMapping("_size_t","_int",0);
|
||||
SWIG_RegisterMapping("_size_t","_wxWindowID",0);
|
||||
@@ -6511,6 +6432,7 @@ SWIGEXPORT(void,initcontrolsc)() {
|
||||
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
|
||||
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
|
||||
SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
|
||||
SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
|
||||
SWIG_RegisterMapping("_uint","_size_t",0);
|
||||
SWIG_RegisterMapping("_uint","_unsigned_int",0);
|
||||
SWIG_RegisterMapping("_uint","_int",0);
|
||||
@@ -6531,10 +6453,12 @@ SWIGEXPORT(void,initcontrolsc)() {
|
||||
SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
|
||||
SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
|
||||
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
|
||||
SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
|
||||
SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
|
||||
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
|
||||
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
|
||||
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
|
||||
SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
|
||||
SWIG_RegisterMapping("_EBool","_signed_int",0);
|
||||
SWIG_RegisterMapping("_EBool","_int",0);
|
||||
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
|
||||
@@ -6556,6 +6480,7 @@ SWIGEXPORT(void,initcontrolsc)() {
|
||||
SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0);
|
||||
SWIG_RegisterMapping("_wxComboBox","_class_wxComboBox",0);
|
||||
SWIG_RegisterMapping("_wxRadioButton","_class_wxRadioButton",0);
|
||||
SWIG_RegisterMapping("_signed_int","_wxPrintQuality",0);
|
||||
SWIG_RegisterMapping("_signed_int","_EBool",0);
|
||||
SWIG_RegisterMapping("_signed_int","_wxWindowID",0);
|
||||
SWIG_RegisterMapping("_signed_int","_int",0);
|
||||
@@ -6671,6 +6596,7 @@ SWIGEXPORT(void,initcontrolsc)() {
|
||||
SWIG_RegisterMapping("_class_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox);
|
||||
SWIG_RegisterMapping("_class_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox);
|
||||
SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0);
|
||||
SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
|
||||
SWIG_RegisterMapping("_unsigned_int","_size_t",0);
|
||||
SWIG_RegisterMapping("_unsigned_int","_uint",0);
|
||||
SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0);
|
||||
@@ -6685,16 +6611,20 @@ SWIGEXPORT(void,initcontrolsc)() {
|
||||
SWIG_RegisterMapping("_class_wxStaticBox","_wxStaticBox",0);
|
||||
SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0);
|
||||
SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0);
|
||||
SWIG_RegisterMapping("_class_wxChoice","_class_wxComboBox",SwigwxComboBoxTowxChoice);
|
||||
SWIG_RegisterMapping("_class_wxChoice","_wxComboBox",SwigwxComboBoxTowxChoice);
|
||||
SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0);
|
||||
SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0);
|
||||
SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0);
|
||||
SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0);
|
||||
SWIG_RegisterMapping("_wxWindowID","_wxPrintQuality",0);
|
||||
SWIG_RegisterMapping("_wxWindowID","_size_t",0);
|
||||
SWIG_RegisterMapping("_wxWindowID","_EBool",0);
|
||||
SWIG_RegisterMapping("_wxWindowID","_uint",0);
|
||||
SWIG_RegisterMapping("_wxWindowID","_int",0);
|
||||
SWIG_RegisterMapping("_wxWindowID","_signed_int",0);
|
||||
SWIG_RegisterMapping("_wxWindowID","_unsigned_int",0);
|
||||
SWIG_RegisterMapping("_int","_wxPrintQuality",0);
|
||||
SWIG_RegisterMapping("_int","_size_t",0);
|
||||
SWIG_RegisterMapping("_int","_EBool",0);
|
||||
SWIG_RegisterMapping("_int","_uint",0);
|
||||
|
Reference in New Issue
Block a user