From: Robin Dunn Date: Thu, 15 Jan 2004 01:11:12 +0000 (+0000) Subject: reSWIGged X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/eb9b610777c40c1bb8f23b4443d9524024971c36?hp=d2f9bbfd438290b2f2e862dd6a20b0cef3678a44 reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/contrib/ogl/msw/ogl_wrap.cpp b/wxPython/contrib/ogl/msw/ogl_wrap.cpp index 1ffce41500..5457033f2c 100644 --- a/wxPython/contrib/ogl/msw/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/msw/ogl_wrap.cpp @@ -1256,7 +1256,7 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyO static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxShapeRegion *arg1 = (wxShapeRegion *) 0 ; - wxColour *result; + wxColour result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL @@ -1266,12 +1266,16 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxColour *)(arg1)->GetActualColourObject(); + result = (arg1)->GetActualColourObject(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColour, 0); + { + wxColour * resultptr; + resultptr = new wxColour((wxColour &) result); + resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1); + } return resultobj; fail: return NULL; diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py index b9a7e1b00c..f93c22635f 100644 --- a/wxPython/src/msw/controls.py +++ b/wxPython/src/msw/controls.py @@ -1552,8 +1552,36 @@ def PreSpinCtrl(*args, **kwargs): val.thisown = 1 return val +class SpinEvent(core.NotifyEvent): + def __repr__(self): + return "<%s.%s; proxy of C++ wxSpinEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) + def __init__(self, *args, **kwargs): + """__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -> SpinEvent""" + newobj = _controls.new_SpinEvent(*args, **kwargs) + self.this = newobj.this + self.thisown = 1 + del newobj.thisown + def GetPosition(*args, **kwargs): + """GetPosition() -> int""" + return _controls.SpinEvent_GetPosition(*args, **kwargs) + + def SetPosition(*args, **kwargs): + """SetPosition(int pos)""" + return _controls.SpinEvent_SetPosition(*args, **kwargs) + + +class SpinEventPtr(SpinEvent): + def __init__(self, this): + self.this = this + if not hasattr(self,"thisown"): self.thisown = 0 + self.__class__ = SpinEvent +_controls.SpinEvent_swigregister(SpinEventPtr) + wxEVT_COMMAND_SPINCTRL_UPDATED = _controls.wxEVT_COMMAND_SPINCTRL_UPDATED -EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1) +EVT_SPIN_UP = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEUP, 1) +EVT_SPIN_DOWN = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEDOWN, 1) +EVT_SPIN = wx.PyEventBinder( wx.wxEVT_SCROLL_THUMBTRACK, 1) +EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1) #--------------------------------------------------------------------------- diff --git a/wxPython/src/msw/controls_wrap.cpp b/wxPython/src/msw/controls_wrap.cpp index 276d82e311..db3ed88042 100644 --- a/wxPython/src/msw/controls_wrap.cpp +++ b/wxPython/src/msw/controls_wrap.cpp @@ -267,32 +267,33 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxHelpEvent swig_types[55] #define SWIGTYPE_p_wxListItem swig_types[56] #define SWIGTYPE_p_wxNotebookSizer swig_types[57] -#define SWIGTYPE_p_wxGenericDragImage swig_types[58] -#define SWIGTYPE_p_wxSpinCtrl swig_types[59] -#define SWIGTYPE_p_wxImageList swig_types[60] -#define SWIGTYPE_p_wxHelpProvider swig_types[61] -#define SWIGTYPE_p_wxTextAttr swig_types[62] -#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[63] -#define SWIGTYPE_p_wxPoint swig_types[64] -#define SWIGTYPE_p_wxListbookEvent swig_types[65] -#define SWIGTYPE_p_wxNotebookEvent swig_types[66] -#define SWIGTYPE_p_wxObject swig_types[67] -#define SWIGTYPE_p_wxCursor swig_types[68] -#define SWIGTYPE_p_wxKeyEvent swig_types[69] -#define SWIGTYPE_p_wxWindow swig_types[70] -#define SWIGTYPE_p_wxString swig_types[71] -#define SWIGTYPE_p_wxBitmap swig_types[72] -#define SWIGTYPE_p_wxTreeEvent swig_types[73] -#define SWIGTYPE_p_wxMouseEvent swig_types[74] -#define SWIGTYPE_p_wxCommandEvent swig_types[75] -#define SWIGTYPE_p_wxStaticText swig_types[76] -#define SWIGTYPE_p_wxControlWithItems swig_types[77] -#define SWIGTYPE_p_wxToolBarToolBase swig_types[78] -#define SWIGTYPE_p_wxColour swig_types[79] -#define SWIGTYPE_p_wxToolBar swig_types[80] -#define SWIGTYPE_p_wxBookCtrlSizer swig_types[81] -#define SWIGTYPE_p_wxValidator swig_types[82] -static swig_type_info *swig_types[84]; +#define SWIGTYPE_p_wxSpinEvent swig_types[58] +#define SWIGTYPE_p_wxGenericDragImage swig_types[59] +#define SWIGTYPE_p_wxSpinCtrl swig_types[60] +#define SWIGTYPE_p_wxImageList swig_types[61] +#define SWIGTYPE_p_wxHelpProvider swig_types[62] +#define SWIGTYPE_p_wxTextAttr swig_types[63] +#define SWIGTYPE_p_wxSimpleHelpProvider swig_types[64] +#define SWIGTYPE_p_wxPoint swig_types[65] +#define SWIGTYPE_p_wxListbookEvent swig_types[66] +#define SWIGTYPE_p_wxNotebookEvent swig_types[67] +#define SWIGTYPE_p_wxObject swig_types[68] +#define SWIGTYPE_p_wxCursor swig_types[69] +#define SWIGTYPE_p_wxKeyEvent swig_types[70] +#define SWIGTYPE_p_wxWindow swig_types[71] +#define SWIGTYPE_p_wxString swig_types[72] +#define SWIGTYPE_p_wxBitmap swig_types[73] +#define SWIGTYPE_p_wxTreeEvent swig_types[74] +#define SWIGTYPE_p_wxMouseEvent swig_types[75] +#define SWIGTYPE_p_wxCommandEvent swig_types[76] +#define SWIGTYPE_p_wxStaticText swig_types[77] +#define SWIGTYPE_p_wxControlWithItems swig_types[78] +#define SWIGTYPE_p_wxToolBarToolBase swig_types[79] +#define SWIGTYPE_p_wxColour swig_types[80] +#define SWIGTYPE_p_wxToolBar swig_types[81] +#define SWIGTYPE_p_wxBookCtrlSizer swig_types[82] +#define SWIGTYPE_p_wxValidator swig_types[83] +static swig_type_info *swig_types[85]; /* -------- TYPES TABLE (END) -------- */ @@ -375,7 +376,7 @@ wxString wxTextCtrl_GetString(wxTextCtrl *self,long from,long to){ } static const wxString wxPyScrollBarNameStr(wxScrollBarNameStr); static const wxString wxPySPIN_BUTTON_NAME(wxSPIN_BUTTON_NAME); - static const wxString wxPySpinCtrlNameStr(wxT(_T("wxSpinCtrl"))); + static const wxString wxPySpinCtrlNameStr(_T("wxSpinCtrl")); static const wxString wxPyRadioBoxNameStr(wxRadioBoxNameStr); static const wxString wxPyRadioButtonNameStr(wxRadioButtonNameStr); @@ -383,9 +384,9 @@ wxString wxTextCtrl_GetString(wxTextCtrl *self,long from,long to){ static const wxString wxPySliderNameStr(wxSliderNameStr); - static const wxString wxPyToggleButtonNameStr(wxT(_T("wxToggleButton"))); + static const wxString wxPyToggleButtonNameStr(_T("wxToggleButton")); -#ifdef __WXMAC__ +#if defined(__WXMAC__) || defined(__WXX11__) // implement dummy classes and such for wxMac #define wxEVT_COMMAND_TOGGLEBUTTON_CLICKED 0 @@ -449,7 +450,7 @@ void wxToolBarBase_SetToolClientData(wxToolBarBase *self,int id,PyObject *client #include - static const wxString wxPyListCtrlNameStr(wxT(_T("wxListCtrl"))); + static const wxString wxPyListCtrlNameStr(_T("wxListCtrl")); void wxListItemAttr_Destroy(wxListItemAttr *self){ delete self; } // Python aware sorting function for wxPyListCtrl static int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) { @@ -553,7 +554,7 @@ wxWindow *wxPyListCtrl_GetMainWindow(wxPyListCtrl *self){ #include #include "wx/wxPython/pytree.h" - static const wxString wxPyTreeCtrlNameStr(wxT(_T("wxTreeCtrl"))); + static const wxString wxPyTreeCtrlNameStr(_T("wxTreeCtrl")); bool wxTreeItemId_operator_ee___(wxTreeItemId *self,wxTreeItemId const *other){ if (!other) return False; return *self == *other; @@ -9451,6 +9452,87 @@ static PyObject * SpinCtrl_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } +static PyObject *_wrap_new_SpinEvent(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxEventType arg1 = (wxEventType) wxEVT_NULL ; + int arg2 = (int) 0 ; + wxSpinEvent *result; + char *kwnames[] = { + (char *) "commandType",(char *) "winid", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|ii:new_SpinEvent",kwnames,&arg1,&arg2)) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxSpinEvent *)new wxSpinEvent(arg1,arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxSpinEvent, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_SpinEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSpinEvent *arg1 = (wxSpinEvent *) 0 ; + int result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SpinEvent_GetPosition",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (int)((wxSpinEvent const *)arg1)->GetPosition(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = PyInt_FromLong((long)result); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_SpinEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxSpinEvent *arg1 = (wxSpinEvent *) 0 ; + int arg2 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "pos", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi:SpinEvent_SetPosition",kwnames,&obj0,&arg2)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSpinEvent,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->SetPosition(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject * SpinEvent_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxSpinEvent, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} static int _wrap_RadioBoxNameStr_set(PyObject *_val) { PyErr_SetString(PyExc_TypeError,"Variable RadioBoxNameStr is read-only."); return 1; @@ -26808,6 +26890,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"SpinCtrl_GetMax", (PyCFunction) _wrap_SpinCtrl_GetMax, METH_VARARGS | METH_KEYWORDS }, { (char *)"SpinCtrl_SetSelection", (PyCFunction) _wrap_SpinCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS }, { (char *)"SpinCtrl_swigregister", SpinCtrl_swigregister, METH_VARARGS }, + { (char *)"new_SpinEvent", (PyCFunction) _wrap_new_SpinEvent, METH_VARARGS | METH_KEYWORDS }, + { (char *)"SpinEvent_GetPosition", (PyCFunction) _wrap_SpinEvent_GetPosition, METH_VARARGS | METH_KEYWORDS }, + { (char *)"SpinEvent_SetPosition", (PyCFunction) _wrap_SpinEvent_SetPosition, METH_VARARGS | METH_KEYWORDS }, + { (char *)"SpinEvent_swigregister", SpinEvent_swigregister, METH_VARARGS }, { (char *)"new_RadioBox", (PyCFunction) _wrap_new_RadioBox, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_PreRadioBox", (PyCFunction) _wrap_new_PreRadioBox, METH_VARARGS | METH_KEYWORDS }, { (char *)"RadioBox_Create", (PyCFunction) _wrap_RadioBox_Create, METH_VARARGS | METH_KEYWORDS }, @@ -27529,6 +27615,9 @@ static void *_p_wxKeyEventTo_p_wxEvent(void *x) { static void *_p_wxScrollWinEventTo_p_wxEvent(void *x) { return (void *)((wxEvent *) ((wxScrollWinEvent *) x)); } +static void *_p_wxSpinEventTo_p_wxEvent(void *x) { + return (void *)((wxEvent *) (wxCommandEvent *)(wxNotifyEvent *) ((wxSpinEvent *) x)); +} static void *_p_wxComboBoxTo_p_wxItemContainer(void *x) { return (void *)((wxItemContainer *) (wxControlWithItems *)(wxChoice *) ((wxComboBox *) x)); } @@ -27667,6 +27756,9 @@ static void *_p_wxBookCtrlEventTo_p_wxNotifyEvent(void *x) { static void *_p_wxListEventTo_p_wxNotifyEvent(void *x) { return (void *)((wxNotifyEvent *) ((wxListEvent *) x)); } +static void *_p_wxSpinEventTo_p_wxNotifyEvent(void *x) { + return (void *)((wxNotifyEvent *) ((wxSpinEvent *) x)); +} static void *_p_wxNotebookEventTo_p_wxNotifyEvent(void *x) { return (void *)((wxNotifyEvent *) (wxBookCtrlEvent *) ((wxNotebookEvent *) x)); } @@ -28078,6 +28170,9 @@ static void *_p_wxNotebookSizerTo_p_wxObject(void *x) { static void *_p_wxScrollWinEventTo_p_wxObject(void *x) { return (void *)((wxObject *) (wxEvent *) ((wxScrollWinEvent *) x)); } +static void *_p_wxSpinEventTo_p_wxObject(void *x) { + return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *)(wxNotifyEvent *) ((wxSpinEvent *) x)); +} static void *_p_wxGenericDragImageTo_p_wxObject(void *x) { return (void *)((wxObject *) ((wxGenericDragImage *) x)); } @@ -28309,6 +28404,9 @@ static void *_p_wxWindowCreateEventTo_p_wxCommandEvent(void *x) { static void *_p_wxTreeEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxTreeEvent *) x)); } +static void *_p_wxSpinEventTo_p_wxCommandEvent(void *x) { + return (void *)((wxCommandEvent *) (wxNotifyEvent *) ((wxSpinEvent *) x)); +} static void *_p_wxHelpEventTo_p_wxCommandEvent(void *x) { return (void *)((wxCommandEvent *) ((wxHelpEvent *) x)); } @@ -28343,7 +28441,7 @@ static swig_type_info _swigt__p_wxTreeItemIdValue[] = {{"_p_wxTreeItemIdValue", static swig_type_info _swigt__wxTreeItemIdValue[] = {{"_wxTreeItemIdValue", 0, "wxTreeItemIdValue", 0},{"_wxTreeItemIdValue"},{0}}; static swig_type_info _swigt__p_wxCheckBox[] = {{"_p_wxCheckBox", 0, "wxCheckBox *", 0},{"_p_wxCheckBox"},{0}}; static swig_type_info _swigt__p_wxPyTreeCtrl[] = {{"_p_wxPyTreeCtrl", 0, "wxPyTreeCtrl *", 0},{"_p_wxPyTreeCtrl"},{0}}; -static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxEvent},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxListEvent", _p_wxListEventTo_p_wxEvent},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxEvent},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{0}}; +static swig_type_info _swigt__p_wxEvent[] = {{"_p_wxEvent", 0, "wxEvent *", 0},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxEvent},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxEvent},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxEvent},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxEvent},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxEvent},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxEvent},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxEvent},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxEvent},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxEvent},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxEvent},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxEvent},{"_p_wxListEvent", _p_wxListEventTo_p_wxEvent},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxEvent},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxEvent},{"_p_wxEvent"},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxEvent},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxEvent},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxEvent},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxEvent},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxEvent},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxEvent},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxEvent},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxEvent},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxEvent},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxEvent},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxEvent},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxEvent},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxEvent},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxEvent},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxEvent},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxEvent},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxEvent},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxEvent},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxEvent},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxEvent},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxEvent},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxEvent},{0}}; static swig_type_info _swigt__p_wxGenericDirCtrl[] = {{"_p_wxGenericDirCtrl", 0, "wxGenericDirCtrl *", 0},{"_p_wxGenericDirCtrl"},{0}}; static swig_type_info _swigt__p_bool[] = {{"_p_bool", 0, "bool *", 0},{"_p_bool"},{0}}; static swig_type_info _swigt__p_wxPyTreeItemData[] = {{"_p_wxPyTreeItemData", 0, "wxPyTreeItemData *", 0},{"_p_wxPyTreeItemData"},{0}}; @@ -28368,7 +28466,7 @@ static swig_type_info _swigt__p_wxListView[] = {{"_p_wxListView", 0, "wxListView static swig_type_info _swigt__p_wxIcon[] = {{"_p_wxIcon", 0, "wxIcon *", 0},{"_p_wxIcon"},{0}}; static swig_type_info _swigt__p_wxTextCtrl[] = {{"_p_wxTextCtrl", 0, "wxTextCtrl *", 0},{"_p_wxTextCtrl"},{0}}; static swig_type_info _swigt__p_wxNotebook[] = {{"_p_wxNotebook", 0, "wxNotebook *", 0},{"_p_wxNotebook"},{0}}; -static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxNotifyEvent},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxNotifyEvent},{"_p_wxListEvent", _p_wxListEventTo_p_wxNotifyEvent},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxNotifyEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxNotifyEvent},{"_p_wxNotifyEvent"},{0}}; +static swig_type_info _swigt__p_wxNotifyEvent[] = {{"_p_wxNotifyEvent", 0, "wxNotifyEvent *", 0},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxNotifyEvent},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxNotifyEvent},{"_p_wxListEvent", _p_wxListEventTo_p_wxNotifyEvent},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxNotifyEvent},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxNotifyEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxNotifyEvent},{"_p_wxNotifyEvent"},{0}}; static swig_type_info _swigt__p_wxArrayString[] = {{"_p_wxArrayString", 0, "wxArrayString *", 0},{"_p_wxArrayString"},{0}}; static swig_type_info _swigt__p_wxListbook[] = {{"_p_wxListbook", 0, "wxListbook *", 0},{"_p_wxListbook"},{0}}; static swig_type_info _swigt__p_wxStaticBitmap[] = {{"_p_wxStaticBitmap", 0, "wxStaticBitmap *", 0},{"_p_wxStaticBitmap"},{0}}; @@ -28394,6 +28492,7 @@ static swig_type_info _swigt__p_wxComboBox[] = {{"_p_wxComboBox", 0, "wxComboBox static swig_type_info _swigt__p_wxHelpEvent[] = {{"_p_wxHelpEvent", 0, "wxHelpEvent *", 0},{"_p_wxHelpEvent"},{0}}; static swig_type_info _swigt__p_wxListItem[] = {{"_p_wxListItem", 0, "wxListItem *", 0},{"_p_wxListItem"},{0}}; static swig_type_info _swigt__p_wxNotebookSizer[] = {{"_p_wxNotebookSizer", 0, "wxNotebookSizer *", 0},{"_p_wxNotebookSizer"},{0}}; +static swig_type_info _swigt__p_wxSpinEvent[] = {{"_p_wxSpinEvent", 0, "wxSpinEvent *", 0},{"_p_wxSpinEvent"},{0}}; static swig_type_info _swigt__p_wxGenericDragImage[] = {{"_p_wxGenericDragImage", 0, "wxGenericDragImage *", 0},{"_p_wxGenericDragImage"},{0}}; static swig_type_info _swigt__p_wxSpinCtrl[] = {{"_p_wxSpinCtrl", 0, "wxSpinCtrl *", 0},{"_p_wxSpinCtrl"},{0}}; static swig_type_info _swigt__p_wxImageList[] = {{"_p_wxImageList", 0, "wxImageList *", 0},{"_p_wxImageList"},{0}}; @@ -28403,7 +28502,7 @@ static swig_type_info _swigt__p_wxSimpleHelpProvider[] = {{"_p_wxSimpleHelpProvi static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0},{"_p_wxPoint"},{0}}; static swig_type_info _swigt__p_wxListbookEvent[] = {{"_p_wxListbookEvent", 0, "wxListbookEvent *", 0},{"_p_wxListbookEvent"},{0}}; static swig_type_info _swigt__p_wxNotebookEvent[] = {{"_p_wxNotebookEvent", 0, "wxNotebookEvent *", 0},{"_p_wxNotebookEvent"},{0}}; -static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxListView", _p_wxListViewTo_p_wxObject},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxListbook", _p_wxListbookTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject},{"_p_wxSlider", _p_wxSliderTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxObject},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject},{"_p_wxButton", _p_wxButtonTo_p_wxObject},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject},{"_p_wxListItem", _p_wxListItemTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{0}}; +static swig_type_info _swigt__p_wxObject[] = {{"_p_wxObject", 0, "wxObject *", 0},{"_p_wxLayoutConstraints", _p_wxLayoutConstraintsTo_p_wxObject},{"_p_wxGBSizerItem", _p_wxGBSizerItemTo_p_wxObject},{"_p_wxSizerItem", _p_wxSizerItemTo_p_wxObject},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxObject},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxObject},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxObject},{"_p_wxIndividualLayoutConstraint", _p_wxIndividualLayoutConstraintTo_p_wxObject},{"_p_wxStaticBoxSizer", _p_wxStaticBoxSizerTo_p_wxObject},{"_p_wxBoxSizer", _p_wxBoxSizerTo_p_wxObject},{"_p_wxSizer", _p_wxSizerTo_p_wxObject},{"_p_wxGridBagSizer", _p_wxGridBagSizerTo_p_wxObject},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxObject},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxObject},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxObject},{"_p_wxMenu", _p_wxMenuTo_p_wxObject},{"_p_wxEvent", _p_wxEventTo_p_wxObject},{"_p_wxGridSizer", _p_wxGridSizerTo_p_wxObject},{"_p_wxFlexGridSizer", _p_wxFlexGridSizerTo_p_wxObject},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxObject},{"_p_wxInitDialogEvent", _p_wxInitDialogEventTo_p_wxObject},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxObject},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxObject},{"_p_wxPaintEvent", _p_wxPaintEventTo_p_wxObject},{"_p_wxNcPaintEvent", _p_wxNcPaintEventTo_p_wxObject},{"_p_wxPaletteChangedEvent", _p_wxPaletteChangedEventTo_p_wxObject},{"_p_wxDisplayChangedEvent", _p_wxDisplayChangedEventTo_p_wxObject},{"_p_wxMouseCaptureChangedEvent", _p_wxMouseCaptureChangedEventTo_p_wxObject},{"_p_wxSysColourChangedEvent", _p_wxSysColourChangedEventTo_p_wxObject},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxObject},{"_p_wxPyControl", _p_wxPyControlTo_p_wxObject},{"_p_wxControl", _p_wxControlTo_p_wxObject},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxObject},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxObject},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxObject},{"_p_wxGauge", _p_wxGaugeTo_p_wxObject},{"_p_wxSetCursorEvent", _p_wxSetCursorEventTo_p_wxObject},{"_p_wxChoice", _p_wxChoiceTo_p_wxObject},{"_p_wxFSFile", _p_wxFSFileTo_p_wxObject},{"_p_wxPySizer", _p_wxPySizerTo_p_wxObject},{"_p_wxListView", _p_wxListViewTo_p_wxObject},{"_p_wxNotebook", _p_wxNotebookTo_p_wxObject},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxObject},{"_p_wxPyEvent", _p_wxPyEventTo_p_wxObject},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxObject},{"_p_wxListbook", _p_wxListbookTo_p_wxObject},{"_p_wxShowEvent", _p_wxShowEventTo_p_wxObject},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxObject},{"_p_wxSlider", _p_wxSliderTo_p_wxObject},{"_p_wxIdleEvent", _p_wxIdleEventTo_p_wxObject},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxObject},{"_p_wxQueryNewPaletteEvent", _p_wxQueryNewPaletteEventTo_p_wxObject},{"_p_wxMaximizeEvent", _p_wxMaximizeEventTo_p_wxObject},{"_p_wxIconizeEvent", _p_wxIconizeEventTo_p_wxObject},{"_p_wxActivateEvent", _p_wxActivateEventTo_p_wxObject},{"_p_wxSizeEvent", _p_wxSizeEventTo_p_wxObject},{"_p_wxMoveEvent", _p_wxMoveEventTo_p_wxObject},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxObject},{"_p_wxMenuItem", _p_wxMenuItemTo_p_wxObject},{"_p_wxContextHelp", _p_wxContextHelpTo_p_wxObject},{"_p_wxListEvent", _p_wxListEventTo_p_wxObject},{"_p_wxEvtHandler", _p_wxEvtHandlerTo_p_wxObject},{"_p_wxTIFFHandler", _p_wxTIFFHandlerTo_p_wxObject},{"_p_wxImageHandler", _p_wxImageHandlerTo_p_wxObject},{"_p_wxBMPHandler", _p_wxBMPHandlerTo_p_wxObject},{"_p_wxICOHandler", _p_wxICOHandlerTo_p_wxObject},{"_p_wxCURHandler", _p_wxCURHandlerTo_p_wxObject},{"_p_wxANIHandler", _p_wxANIHandlerTo_p_wxObject},{"_p_wxPNGHandler", _p_wxPNGHandlerTo_p_wxObject},{"_p_wxGIFHandler", _p_wxGIFHandlerTo_p_wxObject},{"_p_wxPCXHandler", _p_wxPCXHandlerTo_p_wxObject},{"_p_wxJPEGHandler", _p_wxJPEGHandlerTo_p_wxObject},{"_p_wxPNMHandler", _p_wxPNMHandlerTo_p_wxObject},{"_p_wxXPMHandler", _p_wxXPMHandlerTo_p_wxObject},{"_p_wxListBox", _p_wxListBoxTo_p_wxObject},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxObject},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxObject},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxObject},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxObject},{"_p_wxButton", _p_wxButtonTo_p_wxObject},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxObject},{"_p_wxAcceleratorTable", _p_wxAcceleratorTableTo_p_wxObject},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxObject},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxObject},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxObject},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxObject},{"_p_wxListItem", _p_wxListItemTo_p_wxObject},{"_p_wxImage", _p_wxImageTo_p_wxObject},{"_p_wxNotebookSizer", _p_wxNotebookSizerTo_p_wxObject},{"_p_wxScrollWinEvent", _p_wxScrollWinEventTo_p_wxObject},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxObject},{"_p_wxGenericDragImage", _p_wxGenericDragImageTo_p_wxObject},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxObject},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxObject},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxObject},{"_p_wxObject"},{"_p_wxKeyEvent", _p_wxKeyEventTo_p_wxObject},{"_p_wxNavigationKeyEvent", _p_wxNavigationKeyEventTo_p_wxObject},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxObject},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxObject},{"_p_wxWindow", _p_wxWindowTo_p_wxObject},{"_p_wxFileSystem", _p_wxFileSystemTo_p_wxObject},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxObject},{"_p_wxMenuEvent", _p_wxMenuEventTo_p_wxObject},{"_p_wxCloseEvent", _p_wxCloseEventTo_p_wxObject},{"_p_wxMouseEvent", _p_wxMouseEventTo_p_wxObject},{"_p_wxEraseEvent", _p_wxEraseEventTo_p_wxObject},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxObject},{"_p_wxPyApp", _p_wxPyAppTo_p_wxObject},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxObject},{"_p_wxCommandEvent", _p_wxCommandEventTo_p_wxObject},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxObject},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxObject},{"_p_wxFocusEvent", _p_wxFocusEventTo_p_wxObject},{"_p_wxDropFilesEvent", _p_wxDropFilesEventTo_p_wxObject},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxObject},{"_p_wxToolBarToolBase", _p_wxToolBarToolBaseTo_p_wxObject},{"_p_wxToolBar", _p_wxToolBarTo_p_wxObject},{"_p_wxBookCtrlSizer", _p_wxBookCtrlSizerTo_p_wxObject},{"_p_wxValidator", _p_wxValidatorTo_p_wxObject},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxObject},{0}}; static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0},{"_p_wxCursor"},{0}}; static swig_type_info _swigt__p_wxKeyEvent[] = {{"_p_wxKeyEvent", 0, "wxKeyEvent *", 0},{"_p_wxKeyEvent"},{0}}; static swig_type_info _swigt__p_wxWindow[] = {{"_p_wxWindow", 0, "wxWindow *", 0},{"_p_wxBookCtrl", _p_wxBookCtrlTo_p_wxWindow},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxWindow},{"_p_wxToolBar", _p_wxToolBarTo_p_wxWindow},{"_p_wxToggleButton", _p_wxToggleButtonTo_p_wxWindow},{"_p_wxRadioButton", _p_wxRadioButtonTo_p_wxWindow},{"_p_wxWindow"},{"_p_wxPyControl", _p_wxPyControlTo_p_wxWindow},{"_p_wxControl", _p_wxControlTo_p_wxWindow},{"_p_wxToolBarBase", _p_wxToolBarBaseTo_p_wxWindow},{"_p_wxPyListCtrl", _p_wxPyListCtrlTo_p_wxWindow},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxWindow},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxWindow},{"_p_wxGenericDirCtrl", _p_wxGenericDirCtrlTo_p_wxWindow},{"_p_wxScrollBar", _p_wxScrollBarTo_p_wxWindow},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxWindow},{"_p_wxGauge", _p_wxGaugeTo_p_wxWindow},{"_p_wxStaticLine", _p_wxStaticLineTo_p_wxWindow},{"_p_wxListbook", _p_wxListbookTo_p_wxWindow},{"_p_wxPyTreeCtrl", _p_wxPyTreeCtrlTo_p_wxWindow},{"_p_wxCheckBox", _p_wxCheckBoxTo_p_wxWindow},{"_p_wxRadioBox", _p_wxRadioBoxTo_p_wxWindow},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxWindow},{"_p_wxListBox", _p_wxListBoxTo_p_wxWindow},{"_p_wxChoice", _p_wxChoiceTo_p_wxWindow},{"_p_wxListView", _p_wxListViewTo_p_wxWindow},{"_p_wxNotebook", _p_wxNotebookTo_p_wxWindow},{"_p_wxStaticBitmap", _p_wxStaticBitmapTo_p_wxWindow},{"_p_wxSpinCtrl", _p_wxSpinCtrlTo_p_wxWindow},{"_p_wxStaticText", _p_wxStaticTextTo_p_wxWindow},{"_p_wxStaticBox", _p_wxStaticBoxTo_p_wxWindow},{"_p_wxSlider", _p_wxSliderTo_p_wxWindow},{"_p_wxButton", _p_wxButtonTo_p_wxWindow},{"_p_wxSpinButton", _p_wxSpinButtonTo_p_wxWindow},{"_p_wxContextHelpButton", _p_wxContextHelpButtonTo_p_wxWindow},{"_p_wxBitmapButton", _p_wxBitmapButtonTo_p_wxWindow},{"_p_wxTextCtrl", _p_wxTextCtrlTo_p_wxWindow},{0}}; @@ -28411,7 +28510,7 @@ static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0 static swig_type_info _swigt__p_wxBitmap[] = {{"_p_wxBitmap", 0, "wxBitmap *", 0},{"_p_wxBitmap"},{0}}; static swig_type_info _swigt__p_wxTreeEvent[] = {{"_p_wxTreeEvent", 0, "wxTreeEvent *", 0},{"_p_wxTreeEvent"},{0}}; static swig_type_info _swigt__p_wxMouseEvent[] = {{"_p_wxMouseEvent", 0, "wxMouseEvent *", 0},{"_p_wxMouseEvent"},{0}}; -static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxCommandEvent},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxCommandEvent},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxCommandEvent},{"_p_wxListEvent", _p_wxListEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxCommandEvent},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxCommandEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{0}}; +static swig_type_info _swigt__p_wxCommandEvent[] = {{"_p_wxCommandEvent", 0, "wxCommandEvent *", 0},{"_p_wxWindowDestroyEvent", _p_wxWindowDestroyEventTo_p_wxCommandEvent},{"_p_wxBookCtrlEvent", _p_wxBookCtrlEventTo_p_wxCommandEvent},{"_p_wxTextUrlEvent", _p_wxTextUrlEventTo_p_wxCommandEvent},{"_p_wxScrollEvent", _p_wxScrollEventTo_p_wxCommandEvent},{"_p_wxPyCommandEvent", _p_wxPyCommandEventTo_p_wxCommandEvent},{"_p_wxCommandEvent"},{"_p_wxContextMenuEvent", _p_wxContextMenuEventTo_p_wxCommandEvent},{"_p_wxChildFocusEvent", _p_wxChildFocusEventTo_p_wxCommandEvent},{"_p_wxListbookEvent", _p_wxListbookEventTo_p_wxCommandEvent},{"_p_wxNotebookEvent", _p_wxNotebookEventTo_p_wxCommandEvent},{"_p_wxListEvent", _p_wxListEventTo_p_wxCommandEvent},{"_p_wxWindowCreateEvent", _p_wxWindowCreateEventTo_p_wxCommandEvent},{"_p_wxTreeEvent", _p_wxTreeEventTo_p_wxCommandEvent},{"_p_wxSpinEvent", _p_wxSpinEventTo_p_wxCommandEvent},{"_p_wxHelpEvent", _p_wxHelpEventTo_p_wxCommandEvent},{"_p_wxNotifyEvent", _p_wxNotifyEventTo_p_wxCommandEvent},{"_p_wxUpdateUIEvent", _p_wxUpdateUIEventTo_p_wxCommandEvent},{0}}; static swig_type_info _swigt__p_wxStaticText[] = {{"_p_wxStaticText", 0, "wxStaticText *", 0},{"_p_wxStaticText"},{0}}; static swig_type_info _swigt__p_wxControlWithItems[] = {{"_p_wxControlWithItems", 0, "wxControlWithItems *", 0},{"_p_wxComboBox", _p_wxComboBoxTo_p_wxControlWithItems},{"_p_wxDirFilterListCtrl", _p_wxDirFilterListCtrlTo_p_wxControlWithItems},{"_p_wxChoice", _p_wxChoiceTo_p_wxControlWithItems},{"_p_wxControlWithItems"},{"_p_wxListBox", _p_wxListBoxTo_p_wxControlWithItems},{"_p_wxCheckListBox", _p_wxCheckListBoxTo_p_wxControlWithItems},{0}}; static swig_type_info _swigt__p_wxToolBarToolBase[] = {{"_p_wxToolBarToolBase", 0, "wxToolBarToolBase *", 0},{"_p_wxToolBarToolBase"},{0}}; @@ -28479,6 +28578,7 @@ _swigt__p_wxComboBox, _swigt__p_wxHelpEvent, _swigt__p_wxListItem, _swigt__p_wxNotebookSizer, +_swigt__p_wxSpinEvent, _swigt__p_wxGenericDragImage, _swigt__p_wxSpinCtrl, _swigt__p_wxImageList, diff --git a/wxPython/src/msw/core.py b/wxPython/src/msw/core.py index f6d719898e..13999698c1 100644 --- a/wxPython/src/msw/core.py +++ b/wxPython/src/msw/core.py @@ -2939,10 +2939,6 @@ EVT_COMMAND_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1) EVT_COMMAND_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE, 1) EVT_COMMAND_SCROLL_ENDSCROLL = wx.PyEventBinder( wxEVT_SCROLL_ENDSCROLL, 1) -EVT_SPIN_UP = wx.PyEventBinder( wxEVT_SCROLL_LINEUP, 1) -EVT_SPIN_DOWN = wx.PyEventBinder( wxEVT_SCROLL_LINEDOWN, 1) -EVT_SPIN = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1) - EVT_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_BUTTON_CLICKED, 1) EVT_CHECKBOX = wx.PyEventBinder( wxEVT_COMMAND_CHECKBOX_CLICKED, 1) EVT_CHOICE = wx.PyEventBinder( wxEVT_COMMAND_CHOICE_SELECTED, 1) @@ -4952,6 +4948,7 @@ class PyOnDemandOutputWindow: style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE) self.text = wx.TextCtrl(self.frame, -1, "", style = wx.TE_MULTILINE | wx.TE_READONLY) + self.text.AppendText(st) self.frame.SetSize((450, 300)) self.frame.Show(True) EVT_CLOSE(self.frame, self.OnCloseWindow) diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py index f25c3d4e12..853cc3667a 100644 --- a/wxPython/src/msw/gdi.py +++ b/wxPython/src/msw/gdi.py @@ -611,7 +611,7 @@ class Icon(GDIObject): def __repr__(self): return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(String name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon""" + """__init__(String name, int type, int desiredWidth=-1, int desiredHeight=-1) -> Icon""" newobj = _gdi.new_Icon(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -623,7 +623,7 @@ class Icon(GDIObject): except: pass def LoadFile(*args, **kwargs): - """LoadFile(String name, long flags) -> bool""" + """LoadFile(String name, int type) -> bool""" return _gdi.Icon_LoadFile(*args, **kwargs) def GetHandle(*args, **kwargs): @@ -2771,8 +2771,8 @@ class DC(core.Object): def DrawPolygonList(self, polygons, pens=None, brushes=None): - - + ## Note: This does not currently support fill style or offset + ## you can always use the non-List version if need be. if pens is None: pens = [] elif isinstance(pens, wx.Pen): @@ -2789,9 +2789,9 @@ class DC(core.Object): def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None): - - - + ## NOTE: this does not currently support changing the font + ## Make sure you set Background mode to wxSolid (DC.SetBackgroundMode) + ## If you want backgounds to do anything. if type(textList) == type(''): textList = [textList] elif len(textList) != len(coords): @@ -3139,6 +3139,246 @@ class PrinterDCPtr(PrinterDC): self.__class__ = PrinterDC _gdi.PrinterDC_swigregister(PrinterDCPtr) +class DC_old(DC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = DC.FloodFillXY + GetPixel = DC.GetPixelXY + DrawLine = DC.DrawLineXY + CrossHair = DC.CrossHairXY + DrawArc = DC.DrawArcXY + DrawCheckMark = DC.DrawCheckMarkXY + DrawEllipticArc = DC.DrawEllipticArcXY + DrawPoint = DC.DrawPointXY + DrawRectangle = DC.DrawRectangleXY + DrawRoundedRectangle = DC.DrawRoundedRectangleXY + DrawCircle = DC.DrawCircleXY + DrawEllipse = DC.DrawEllipseXY + DrawIcon = DC.DrawIconXY + DrawBitmap = DC.DrawBitmapXY + DrawText = DC.DrawTextXY + DrawRotatedText = DC.DrawRotatedTextXY + Blit = DC.BlitXY + +class MemoryDC_old(MemoryDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = MemoryDC.FloodFillXY + GetPixel = MemoryDC.GetPixelXY + DrawLine = MemoryDC.DrawLineXY + CrossHair = MemoryDC.CrossHairXY + DrawArc = MemoryDC.DrawArcXY + DrawCheckMark = MemoryDC.DrawCheckMarkXY + DrawEllipticArc = MemoryDC.DrawEllipticArcXY + DrawPoint = MemoryDC.DrawPointXY + DrawRectangle = MemoryDC.DrawRectangleXY + DrawRoundedRectangle = MemoryDC.DrawRoundedRectangleXY + DrawCircle = MemoryDC.DrawCircleXY + DrawEllipse = MemoryDC.DrawEllipseXY + DrawIcon = MemoryDC.DrawIconXY + DrawBitmap = MemoryDC.DrawBitmapXY + DrawText = MemoryDC.DrawTextXY + DrawRotatedText = MemoryDC.DrawRotatedTextXY + Blit = MemoryDC.BlitXY + +class BufferedDC_old(BufferedDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = BufferedDC.FloodFillXY + GetPixel = BufferedDC.GetPixelXY + DrawLine = BufferedDC.DrawLineXY + CrossHair = BufferedDC.CrossHairXY + DrawArc = BufferedDC.DrawArcXY + DrawCheckMark = BufferedDC.DrawCheckMarkXY + DrawEllipticArc = BufferedDC.DrawEllipticArcXY + DrawPoint = BufferedDC.DrawPointXY + DrawRectangle = BufferedDC.DrawRectangleXY + DrawRoundedRectangle = BufferedDC.DrawRoundedRectangleXY + DrawCircle = BufferedDC.DrawCircleXY + DrawEllipse = BufferedDC.DrawEllipseXY + DrawIcon = BufferedDC.DrawIconXY + DrawBitmap = BufferedDC.DrawBitmapXY + DrawText = BufferedDC.DrawTextXY + DrawRotatedText = BufferedDC.DrawRotatedTextXY + Blit = BufferedDC.BlitXY + +class BufferedPaintDC_old(BufferedPaintDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = BufferedPaintDC.FloodFillXY + GetPixel = BufferedPaintDC.GetPixelXY + DrawLine = BufferedPaintDC.DrawLineXY + CrossHair = BufferedPaintDC.CrossHairXY + DrawArc = BufferedPaintDC.DrawArcXY + DrawCheckMark = BufferedPaintDC.DrawCheckMarkXY + DrawEllipticArc = BufferedPaintDC.DrawEllipticArcXY + DrawPoint = BufferedPaintDC.DrawPointXY + DrawRectangle = BufferedPaintDC.DrawRectangleXY + DrawRoundedRectangle = BufferedPaintDC.DrawRoundedRectangleXY + DrawCircle = BufferedPaintDC.DrawCircleXY + DrawEllipse = BufferedPaintDC.DrawEllipseXY + DrawIcon = BufferedPaintDC.DrawIconXY + DrawBitmap = BufferedPaintDC.DrawBitmapXY + DrawText = BufferedPaintDC.DrawTextXY + DrawRotatedText = BufferedPaintDC.DrawRotatedTextXY + Blit = BufferedPaintDC.BlitXY + +class ScreenDC_old(ScreenDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = ScreenDC.FloodFillXY + GetPixel = ScreenDC.GetPixelXY + DrawLine = ScreenDC.DrawLineXY + CrossHair = ScreenDC.CrossHairXY + DrawArc = ScreenDC.DrawArcXY + DrawCheckMark = ScreenDC.DrawCheckMarkXY + DrawEllipticArc = ScreenDC.DrawEllipticArcXY + DrawPoint = ScreenDC.DrawPointXY + DrawRectangle = ScreenDC.DrawRectangleXY + DrawRoundedRectangle = ScreenDC.DrawRoundedRectangleXY + DrawCircle = ScreenDC.DrawCircleXY + DrawEllipse = ScreenDC.DrawEllipseXY + DrawIcon = ScreenDC.DrawIconXY + DrawBitmap = ScreenDC.DrawBitmapXY + DrawText = ScreenDC.DrawTextXY + DrawRotatedText = ScreenDC.DrawRotatedTextXY + Blit = ScreenDC.BlitXY + +class ClientDC_old(ClientDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = ClientDC.FloodFillXY + GetPixel = ClientDC.GetPixelXY + DrawLine = ClientDC.DrawLineXY + CrossHair = ClientDC.CrossHairXY + DrawArc = ClientDC.DrawArcXY + DrawCheckMark = ClientDC.DrawCheckMarkXY + DrawEllipticArc = ClientDC.DrawEllipticArcXY + DrawPoint = ClientDC.DrawPointXY + DrawRectangle = ClientDC.DrawRectangleXY + DrawRoundedRectangle = ClientDC.DrawRoundedRectangleXY + DrawCircle = ClientDC.DrawCircleXY + DrawEllipse = ClientDC.DrawEllipseXY + DrawIcon = ClientDC.DrawIconXY + DrawBitmap = ClientDC.DrawBitmapXY + DrawText = ClientDC.DrawTextXY + DrawRotatedText = ClientDC.DrawRotatedTextXY + Blit = ClientDC.BlitXY + +class PaintDC_old(PaintDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = PaintDC.FloodFillXY + GetPixel = PaintDC.GetPixelXY + DrawLine = PaintDC.DrawLineXY + CrossHair = PaintDC.CrossHairXY + DrawArc = PaintDC.DrawArcXY + DrawCheckMark = PaintDC.DrawCheckMarkXY + DrawEllipticArc = PaintDC.DrawEllipticArcXY + DrawPoint = PaintDC.DrawPointXY + DrawRectangle = PaintDC.DrawRectangleXY + DrawRoundedRectangle = PaintDC.DrawRoundedRectangleXY + DrawCircle = PaintDC.DrawCircleXY + DrawEllipse = PaintDC.DrawEllipseXY + DrawIcon = PaintDC.DrawIconXY + DrawBitmap = PaintDC.DrawBitmapXY + DrawText = PaintDC.DrawTextXY + DrawRotatedText = PaintDC.DrawRotatedTextXY + Blit = PaintDC.BlitXY + +class WindowDC_old(WindowDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = WindowDC.FloodFillXY + GetPixel = WindowDC.GetPixelXY + DrawLine = WindowDC.DrawLineXY + CrossHair = WindowDC.CrossHairXY + DrawArc = WindowDC.DrawArcXY + DrawCheckMark = WindowDC.DrawCheckMarkXY + DrawEllipticArc = WindowDC.DrawEllipticArcXY + DrawPoint = WindowDC.DrawPointXY + DrawRectangle = WindowDC.DrawRectangleXY + DrawRoundedRectangle = WindowDC.DrawRoundedRectangleXY + DrawCircle = WindowDC.DrawCircleXY + DrawEllipse = WindowDC.DrawEllipseXY + DrawIcon = WindowDC.DrawIconXY + DrawBitmap = WindowDC.DrawBitmapXY + DrawText = WindowDC.DrawTextXY + DrawRotatedText = WindowDC.DrawRotatedTextXY + Blit = WindowDC.BlitXY + +class MirrorDC_old(MirrorDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = MirrorDC.FloodFillXY + GetPixel = MirrorDC.GetPixelXY + DrawLine = MirrorDC.DrawLineXY + CrossHair = MirrorDC.CrossHairXY + DrawArc = MirrorDC.DrawArcXY + DrawCheckMark = MirrorDC.DrawCheckMarkXY + DrawEllipticArc = MirrorDC.DrawEllipticArcXY + DrawPoint = MirrorDC.DrawPointXY + DrawRectangle = MirrorDC.DrawRectangleXY + DrawRoundedRectangle = MirrorDC.DrawRoundedRectangleXY + DrawCircle = MirrorDC.DrawCircleXY + DrawEllipse = MirrorDC.DrawEllipseXY + DrawIcon = MirrorDC.DrawIconXY + DrawBitmap = MirrorDC.DrawBitmapXY + DrawText = MirrorDC.DrawTextXY + DrawRotatedText = MirrorDC.DrawRotatedTextXY + Blit = MirrorDC.BlitXY + +class PostScriptDC_old(PostScriptDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = PostScriptDC.FloodFillXY + GetPixel = PostScriptDC.GetPixelXY + DrawLine = PostScriptDC.DrawLineXY + CrossHair = PostScriptDC.CrossHairXY + DrawArc = PostScriptDC.DrawArcXY + DrawCheckMark = PostScriptDC.DrawCheckMarkXY + DrawEllipticArc = PostScriptDC.DrawEllipticArcXY + DrawPoint = PostScriptDC.DrawPointXY + DrawRectangle = PostScriptDC.DrawRectangleXY + DrawRoundedRectangle = PostScriptDC.DrawRoundedRectangleXY + DrawCircle = PostScriptDC.DrawCircleXY + DrawEllipse = PostScriptDC.DrawEllipseXY + DrawIcon = PostScriptDC.DrawIconXY + DrawBitmap = PostScriptDC.DrawBitmapXY + DrawText = PostScriptDC.DrawTextXY + DrawRotatedText = PostScriptDC.DrawRotatedTextXY + Blit = PostScriptDC.BlitXY + +class MetaFileDC_old(MetaFileDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = MetaFileDC.FloodFillXY + GetPixel = MetaFileDC.GetPixelXY + DrawLine = MetaFileDC.DrawLineXY + CrossHair = MetaFileDC.CrossHairXY + DrawArc = MetaFileDC.DrawArcXY + DrawCheckMark = MetaFileDC.DrawCheckMarkXY + DrawEllipticArc = MetaFileDC.DrawEllipticArcXY + DrawPoint = MetaFileDC.DrawPointXY + DrawRectangle = MetaFileDC.DrawRectangleXY + DrawRoundedRectangle = MetaFileDC.DrawRoundedRectangleXY + DrawCircle = MetaFileDC.DrawCircleXY + DrawEllipse = MetaFileDC.DrawEllipseXY + DrawIcon = MetaFileDC.DrawIconXY + DrawBitmap = MetaFileDC.DrawBitmapXY + DrawText = MetaFileDC.DrawTextXY + DrawRotatedText = MetaFileDC.DrawRotatedTextXY + Blit = MetaFileDC.BlitXY + +class PrinterDC_old(PrinterDC): + """DC class that has methods with 2.4 compatible parameters.""" + FloodFill = PrinterDC.FloodFillXY + GetPixel = PrinterDC.GetPixelXY + DrawLine = PrinterDC.DrawLineXY + CrossHair = PrinterDC.CrossHairXY + DrawArc = PrinterDC.DrawArcXY + DrawCheckMark = PrinterDC.DrawCheckMarkXY + DrawEllipticArc = PrinterDC.DrawEllipticArcXY + DrawPoint = PrinterDC.DrawPointXY + DrawRectangle = PrinterDC.DrawRectangleXY + DrawRoundedRectangle = PrinterDC.DrawRoundedRectangleXY + DrawCircle = PrinterDC.DrawCircleXY + DrawEllipse = PrinterDC.DrawEllipseXY + DrawIcon = PrinterDC.DrawIconXY + DrawBitmap = PrinterDC.DrawBitmapXY + DrawText = PrinterDC.DrawTextXY + DrawRotatedText = PrinterDC.DrawRotatedTextXY + Blit = PrinterDC.BlitXY + #--------------------------------------------------------------------------- IMAGELIST_DRAW_NORMAL = _gdi.IMAGELIST_DRAW_NORMAL diff --git a/wxPython/src/msw/gdi_wrap.cpp b/wxPython/src/msw/gdi_wrap.cpp index df99a2b7fc..a6ba9574be 100644 --- a/wxPython/src/msw/gdi_wrap.cpp +++ b/wxPython/src/msw/gdi_wrap.cpp @@ -3037,17 +3037,17 @@ static PyObject * Mask_swigregister(PyObject *self, PyObject *args) { static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxString *arg1 = 0 ; - long arg2 ; + int arg2 ; int arg3 = (int) -1 ; int arg4 = (int) -1 ; wxIcon *result; bool temp1 = False ; PyObject * obj0 = 0 ; char *kwnames[] = { - (char *) "name",(char *) "flags",(char *) "desiredWidth",(char *) "desiredHeight", NULL + (char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail; { arg1 = wxString_in_helper(obj0); if (arg1 == NULL) SWIG_fail; @@ -3055,7 +3055,7 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxIcon *)new wxIcon((wxString const &)*arg1,arg2,arg3,arg4); + result = (wxIcon *)new wxIcon((wxString const &)*arg1,(wxBitmapType )arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -3206,16 +3206,16 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k PyObject *resultobj; wxIcon *arg1 = (wxIcon *) 0 ; wxString *arg2 = 0 ; - long arg3 ; + int arg3 ; bool result; bool temp2 = False ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { - (char *) "self",(char *) "name",(char *) "flags", NULL + (char *) "self",(char *) "name",(char *) "type", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = wxString_in_helper(obj1); @@ -3224,7 +3224,7 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3); + result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py index 79aaf7c929..2041b17b10 100644 --- a/wxPython/src/msw/grid.py +++ b/wxPython/src/msw/grid.py @@ -1224,6 +1224,10 @@ class Grid(windows.ScrolledWindow): wxGridSelectCells = _grid.Grid_wxGridSelectCells wxGridSelectRows = _grid.Grid_wxGridSelectRows wxGridSelectColumns = _grid.Grid_wxGridSelectColumns + SelectCells = wxGridSelectCells + SelectRows = wxGridSelectRows + SelectColumns = wxGridSelectColumns, + def CreateGrid(*args, **kwargs): """CreateGrid(int numRows, int numCols, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -> bool""" return _grid.Grid_CreateGrid(*args, **kwargs) diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp index 208dc260ee..9b3882cab2 100644 --- a/wxPython/src/msw/grid_wrap.cpp +++ b/wxPython/src/msw/grid_wrap.cpp @@ -282,7 +282,7 @@ static swig_type_info *swig_types[52]; static const wxString wxPyEmptyString(wxEmptyString); static const wxString wxPyPanelNameStr(wxPanelNameStr); - static const wxString wxPyDateTimeFormatStr(wxT(wxT("%c"))); + static const wxString wxPyDateTimeFormatStr(wxT("%c")); #define wxPyMake_TEMPLATE(TYPE) \ diff --git a/wxPython/src/msw/misc.py b/wxPython/src/msw/misc.py index 570b8aa0ae..05ca825bbf 100644 --- a/wxPython/src/msw/misc.py +++ b/wxPython/src/msw/misc.py @@ -4334,14 +4334,6 @@ class MetafileDataObject(DataObjectSimple): self.this = newobj.this self.thisown = 1 del newobj.thisown - def SetMetafile(*args, **kwargs): - """SetMetafile(wxMetafile metafile)""" - return _misc.MetafileDataObject_SetMetafile(*args, **kwargs) - - def GetMetafile(*args, **kwargs): - """GetMetafile() -> wxMetafile""" - return _misc.MetafileDataObject_GetMetafile(*args, **kwargs) - class MetafileDataObjectPtr(MetafileDataObject): def __init__(self, this): @@ -4370,7 +4362,7 @@ class DropSource(object): return "<%s.%s; proxy of C++ wxPyDropSource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window win=None, Cursor copy=wxNullCursor, Cursor move=wxNullCursor, + __init__(Window win, Cursor copy=wxNullCursor, Cursor move=wxNullCursor, Cursor none=wxNullCursor) -> DropSource """ newobj = _misc.new_DropSource(*args, **kwargs) diff --git a/wxPython/src/msw/misc_wrap.cpp b/wxPython/src/msw/misc_wrap.cpp index 66bbd1a0f7..1de1723f34 100644 --- a/wxPython/src/msw/misc_wrap.cpp +++ b/wxPython/src/msw/misc_wrap.cpp @@ -211,88 +211,87 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con #define SWIGTYPE_p_wxLogChain swig_types[0] #define SWIGTYPE_p_wxMutexGuiLocker swig_types[1] -#define SWIGTYPE_p_wxMetafile swig_types[2] -#define SWIGTYPE_p_wxFileHistory swig_types[3] -#define SWIGTYPE_p_wxLog swig_types[4] -#define SWIGTYPE_p_wxDateTime__TimeZone swig_types[5] -#define SWIGTYPE_p_wxMenu swig_types[6] -#define SWIGTYPE_p_wxEvent swig_types[7] -#define SWIGTYPE_p_wxConfigBase swig_types[8] -#define SWIGTYPE_p_wxWave swig_types[9] -#define SWIGTYPE_p_wxFileType swig_types[10] -#define SWIGTYPE_p_wxLogGui swig_types[11] -#define SWIGTYPE_p_wxFont swig_types[12] -#define SWIGTYPE_p_wxDataFormat swig_types[13] -#define SWIGTYPE_p_wxTimerEvent swig_types[14] -#define SWIGTYPE_p_wxCaret swig_types[15] -#define SWIGTYPE_p_int swig_types[16] -#define SWIGTYPE_p_wxSize swig_types[17] -#define SWIGTYPE_p_wxClipboard swig_types[18] -#define SWIGTYPE_p_wxStopWatch swig_types[19] -#define SWIGTYPE_p_wxDC swig_types[20] -#define SWIGTYPE_p_wxClipboardLocker swig_types[21] -#define SWIGTYPE_p_wxIcon swig_types[22] -#define SWIGTYPE_p_wxLogStderr swig_types[23] -#define SWIGTYPE_p_wxLogTextCtrl swig_types[24] -#define SWIGTYPE_p_wxTextCtrl swig_types[25] -#define SWIGTYPE_p_wxBusyCursor swig_types[26] -#define SWIGTYPE_p_wxFileDataObject swig_types[27] -#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[28] -#define SWIGTYPE_p_wxPyTextDataObject swig_types[29] -#define SWIGTYPE_p_wxBitmapDataObject swig_types[30] -#define SWIGTYPE_p_wxTextDataObject swig_types[31] -#define SWIGTYPE_p_wxDataObject swig_types[32] -#define SWIGTYPE_p_wxCustomDataObject swig_types[33] -#define SWIGTYPE_p_wxURLDataObject swig_types[34] -#define SWIGTYPE_p_wxMetafileDataObject swig_types[35] -#define SWIGTYPE_p_wxTimerRunner swig_types[36] -#define SWIGTYPE_p_wxLogWindow swig_types[37] -#define SWIGTYPE_p_wxTimeSpan swig_types[38] -#define SWIGTYPE_p_wxArrayString swig_types[39] -#define SWIGTYPE_p_wxWindowDisabler swig_types[40] -#define SWIGTYPE_p_wxToolTip swig_types[41] -#define SWIGTYPE_p_wxDataObjectComposite swig_types[42] -#define SWIGTYPE_p_wxFileConfig swig_types[43] -#define SWIGTYPE_p_wxSystemSettings swig_types[44] -#define SWIGTYPE_p_wxPyDataObjectSimple swig_types[45] -#define SWIGTYPE_p_wxDataObjectSimple swig_types[46] -#define SWIGTYPE_p_wxEvtHandler swig_types[47] -#define SWIGTYPE_p_wxRect swig_types[48] -#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[49] -#define SWIGTYPE_p_wxFileTypeInfo swig_types[50] -#define SWIGTYPE_p_wxFrame swig_types[51] -#define SWIGTYPE_p_wxTimer swig_types[52] -#define SWIGTYPE_p_wxMimeTypesManager swig_types[53] -#define SWIGTYPE_p_wxPyArtProvider swig_types[54] -#define SWIGTYPE_p_wxPyTipProvider swig_types[55] -#define SWIGTYPE_p_wxTipProvider swig_types[56] -#define SWIGTYPE_p_wxJoystick swig_types[57] -#define SWIGTYPE_p_wxSystemOptions swig_types[58] -#define SWIGTYPE_p_wxPoint swig_types[59] -#define SWIGTYPE_p_wxJoystickEvent swig_types[60] -#define SWIGTYPE_p_wxCursor swig_types[61] -#define SWIGTYPE_p_wxObject swig_types[62] -#define SWIGTYPE_p_wxOutputStream swig_types[63] -#define SWIGTYPE_p_wxDateTime swig_types[64] -#define SWIGTYPE_p_wxPyDropSource swig_types[65] -#define SWIGTYPE_p_wxWindow swig_types[66] -#define SWIGTYPE_p_wxString swig_types[67] -#define SWIGTYPE_p_wxPyProcess swig_types[68] -#define SWIGTYPE_p_wxBitmap swig_types[69] -#define SWIGTYPE_p_wxConfig swig_types[70] -#define SWIGTYPE_p_wxChar swig_types[71] -#define SWIGTYPE_p_wxBusyInfo swig_types[72] -#define SWIGTYPE_p_wxPyDropTarget swig_types[73] -#define SWIGTYPE_p_wxPyTextDropTarget swig_types[74] -#define SWIGTYPE_p_wxPyFileDropTarget swig_types[75] -#define SWIGTYPE_p_wxProcessEvent swig_types[76] -#define SWIGTYPE_p_wxPyLog swig_types[77] -#define SWIGTYPE_p_wxLogNull swig_types[78] -#define SWIGTYPE_p_wxColour swig_types[79] -#define SWIGTYPE_p_wxConfigPathChanger swig_types[80] -#define SWIGTYPE_p_wxPyTimer swig_types[81] -#define SWIGTYPE_p_wxDateSpan swig_types[82] -static swig_type_info *swig_types[84]; +#define SWIGTYPE_p_wxFileHistory swig_types[2] +#define SWIGTYPE_p_wxLog swig_types[3] +#define SWIGTYPE_p_wxDateTime__TimeZone swig_types[4] +#define SWIGTYPE_p_wxMenu swig_types[5] +#define SWIGTYPE_p_wxEvent swig_types[6] +#define SWIGTYPE_p_wxConfigBase swig_types[7] +#define SWIGTYPE_p_wxWave swig_types[8] +#define SWIGTYPE_p_wxFileType swig_types[9] +#define SWIGTYPE_p_wxLogGui swig_types[10] +#define SWIGTYPE_p_wxFont swig_types[11] +#define SWIGTYPE_p_wxDataFormat swig_types[12] +#define SWIGTYPE_p_wxTimerEvent swig_types[13] +#define SWIGTYPE_p_wxCaret swig_types[14] +#define SWIGTYPE_p_int swig_types[15] +#define SWIGTYPE_p_wxSize swig_types[16] +#define SWIGTYPE_p_wxClipboard swig_types[17] +#define SWIGTYPE_p_wxStopWatch swig_types[18] +#define SWIGTYPE_p_wxDC swig_types[19] +#define SWIGTYPE_p_wxClipboardLocker swig_types[20] +#define SWIGTYPE_p_wxIcon swig_types[21] +#define SWIGTYPE_p_wxLogStderr swig_types[22] +#define SWIGTYPE_p_wxLogTextCtrl swig_types[23] +#define SWIGTYPE_p_wxTextCtrl swig_types[24] +#define SWIGTYPE_p_wxBusyCursor swig_types[25] +#define SWIGTYPE_p_wxFileDataObject swig_types[26] +#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[27] +#define SWIGTYPE_p_wxPyTextDataObject swig_types[28] +#define SWIGTYPE_p_wxBitmapDataObject swig_types[29] +#define SWIGTYPE_p_wxTextDataObject swig_types[30] +#define SWIGTYPE_p_wxDataObject swig_types[31] +#define SWIGTYPE_p_wxCustomDataObject swig_types[32] +#define SWIGTYPE_p_wxURLDataObject swig_types[33] +#define SWIGTYPE_p_wxMetafileDataObject swig_types[34] +#define SWIGTYPE_p_wxTimerRunner swig_types[35] +#define SWIGTYPE_p_wxLogWindow swig_types[36] +#define SWIGTYPE_p_wxTimeSpan swig_types[37] +#define SWIGTYPE_p_wxArrayString swig_types[38] +#define SWIGTYPE_p_wxWindowDisabler swig_types[39] +#define SWIGTYPE_p_wxToolTip swig_types[40] +#define SWIGTYPE_p_wxDataObjectComposite swig_types[41] +#define SWIGTYPE_p_wxFileConfig swig_types[42] +#define SWIGTYPE_p_wxSystemSettings swig_types[43] +#define SWIGTYPE_p_wxPyDataObjectSimple swig_types[44] +#define SWIGTYPE_p_wxDataObjectSimple swig_types[45] +#define SWIGTYPE_p_wxEvtHandler swig_types[46] +#define SWIGTYPE_p_wxRect swig_types[47] +#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[48] +#define SWIGTYPE_p_wxFileTypeInfo swig_types[49] +#define SWIGTYPE_p_wxFrame swig_types[50] +#define SWIGTYPE_p_wxTimer swig_types[51] +#define SWIGTYPE_p_wxMimeTypesManager swig_types[52] +#define SWIGTYPE_p_wxPyArtProvider swig_types[53] +#define SWIGTYPE_p_wxPyTipProvider swig_types[54] +#define SWIGTYPE_p_wxTipProvider swig_types[55] +#define SWIGTYPE_p_wxJoystick swig_types[56] +#define SWIGTYPE_p_wxSystemOptions swig_types[57] +#define SWIGTYPE_p_wxPoint swig_types[58] +#define SWIGTYPE_p_wxJoystickEvent swig_types[59] +#define SWIGTYPE_p_wxCursor swig_types[60] +#define SWIGTYPE_p_wxObject swig_types[61] +#define SWIGTYPE_p_wxOutputStream swig_types[62] +#define SWIGTYPE_p_wxDateTime swig_types[63] +#define SWIGTYPE_p_wxPyDropSource swig_types[64] +#define SWIGTYPE_p_wxWindow swig_types[65] +#define SWIGTYPE_p_wxString swig_types[66] +#define SWIGTYPE_p_wxPyProcess swig_types[67] +#define SWIGTYPE_p_wxBitmap swig_types[68] +#define SWIGTYPE_p_wxConfig swig_types[69] +#define SWIGTYPE_p_wxChar swig_types[70] +#define SWIGTYPE_p_wxBusyInfo swig_types[71] +#define SWIGTYPE_p_wxPyDropTarget swig_types[72] +#define SWIGTYPE_p_wxPyTextDropTarget swig_types[73] +#define SWIGTYPE_p_wxPyFileDropTarget swig_types[74] +#define SWIGTYPE_p_wxProcessEvent swig_types[75] +#define SWIGTYPE_p_wxPyLog swig_types[76] +#define SWIGTYPE_p_wxLogNull swig_types[77] +#define SWIGTYPE_p_wxColour swig_types[78] +#define SWIGTYPE_p_wxConfigPathChanger swig_types[79] +#define SWIGTYPE_p_wxPyTimer swig_types[80] +#define SWIGTYPE_p_wxDateSpan swig_types[81] +static swig_type_info *swig_types[83]; /* -------- TYPES TABLE (END) -------- */ @@ -840,8 +839,8 @@ bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool defaultVa #include - static const wxString wxPyDateFormatStr(wxT(wxT("%c"))); - static const wxString wxPyTimeSpanFormatStr(wxT(wxT("%H:%M:%S"))); + static const wxString wxPyDateFormatStr(wxT("%c")); + static const wxString wxPyTimeSpanFormatStr(wxT("%H:%M:%S")); #define LOCAL_TZ wxDateTime::Local @@ -1039,9 +1038,11 @@ PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){ return PyString_FromStringAndSize((char*)self->GetData(), self->GetSize()); } -#include - - +class wxMetafileDataObject : public wxDataObjectSimple +{ +public: + wxMetafileDataObject() { wxPyRaiseNotImplemented(); } +}; IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback); @@ -23246,65 +23247,6 @@ static PyObject *_wrap_new_MetafileDataObject(PyObject *self, PyObject *args, Py } -static PyObject *_wrap_MetafileDataObject_SetMetafile(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxMetafileDataObject *arg1 = (wxMetafileDataObject *) 0 ; - wxMetafile *arg2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "metafile", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MetafileDataObject_SetMetafile",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMetafileDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMetafile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetMetafile((wxMetafile const &)*arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_MetafileDataObject_GetMetafile(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxMetafileDataObject *arg1 = (wxMetafileDataObject *) 0 ; - wxMetafile result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MetafileDataObject_GetMetafile",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMetafileDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = ((wxMetafileDataObject const *)arg1)->GetMetafile(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - { - wxMetafile * resultptr; - resultptr = new wxMetafile((wxMetafile &) result); - resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxMetafile, 1); - } - return resultobj; - fail: - return NULL; -} - - static PyObject * MetafileDataObject_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -23337,7 +23279,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject * static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) NULL ; + wxWindow *arg1 = (wxWindow *) 0 ; wxCursor const &arg2_defvalue = wxNullCursor ; wxCursor *arg2 = (wxCursor *) &arg2_defvalue ; wxCursor const &arg3_defvalue = wxNullCursor ; @@ -23353,10 +23295,8 @@ static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject * (char *) "win",(char *) "copy",(char *) "move",(char *) "none", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_DropSource",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; - if (obj0) { - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_DropSource",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (arg2 == NULL) { @@ -25369,8 +25309,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"URLDataObject_SetURL", (PyCFunction) _wrap_URLDataObject_SetURL, METH_VARARGS | METH_KEYWORDS }, { (char *)"URLDataObject_swigregister", URLDataObject_swigregister, METH_VARARGS }, { (char *)"new_MetafileDataObject", (PyCFunction) _wrap_new_MetafileDataObject, METH_VARARGS | METH_KEYWORDS }, - { (char *)"MetafileDataObject_SetMetafile", (PyCFunction) _wrap_MetafileDataObject_SetMetafile, METH_VARARGS | METH_KEYWORDS }, - { (char *)"MetafileDataObject_GetMetafile", (PyCFunction) _wrap_MetafileDataObject_GetMetafile, METH_VARARGS | METH_KEYWORDS }, { (char *)"MetafileDataObject_swigregister", MetafileDataObject_swigregister, METH_VARARGS }, { (char *)"IsDragResultOk", (PyCFunction) _wrap_IsDragResultOk, METH_VARARGS | METH_KEYWORDS }, { (char *)"new_DropSource", (PyCFunction) _wrap_new_DropSource, METH_VARARGS | METH_KEYWORDS }, @@ -25935,7 +25873,6 @@ static void *_p_wxPyFileDropTargetTo_p_wxPyDropTarget(void *x) { } static swig_type_info _swigt__p_wxLogChain[] = {{"_p_wxLogChain", 0, "wxLogChain *", 0},{"_p_wxLogChain"},{0}}; static swig_type_info _swigt__p_wxMutexGuiLocker[] = {{"_p_wxMutexGuiLocker", 0, "wxMutexGuiLocker *", 0},{"_p_wxMutexGuiLocker"},{0}}; -static swig_type_info _swigt__p_wxMetafile[] = {{"_p_wxMetafile", 0, "wxMetafile *", 0},{"_p_wxMetafile"},{0}}; static swig_type_info _swigt__p_wxFileHistory[] = {{"_p_wxFileHistory", 0, "wxFileHistory *", 0},{"_p_wxFileHistory"},{0}}; static swig_type_info _swigt__p_wxLog[] = {{"_p_wxLog", 0, "wxLog *", 0},{"_p_wxLogStderr", _p_wxLogStderrTo_p_wxLog},{"_p_wxLogTextCtrl", _p_wxLogTextCtrlTo_p_wxLog},{"_p_wxLogWindow", _p_wxLogWindowTo_p_wxLog},{"_p_wxLogChain", _p_wxLogChainTo_p_wxLog},{"_p_wxLogGui", _p_wxLogGuiTo_p_wxLog},{"_p_wxPyLog", _p_wxPyLogTo_p_wxLog},{"_p_wxLog"},{0}}; static swig_type_info _swigt__p_wxDateTime__TimeZone[] = {{"_p_wxDateTime__TimeZone", 0, "wxDateTime::TimeZone *", 0},{"_p_wxDateTime__TimeZone"},{0}}; @@ -26020,7 +25957,6 @@ static swig_type_info _swigt__p_wxDateSpan[] = {{"_p_wxDateSpan", 0, "wxDateSpan static swig_type_info *swig_types_initial[] = { _swigt__p_wxLogChain, _swigt__p_wxMutexGuiLocker, -_swigt__p_wxMetafile, _swigt__p_wxFileHistory, _swigt__p_wxLog, _swigt__p_wxDateTime__TimeZone, diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py index d311cd5467..a896f93bad 100644 --- a/wxPython/src/msw/windows.py +++ b/wxPython/src/msw/windows.py @@ -422,10 +422,6 @@ class Dialog(TopLevelWindow): """CreateButtonSizer(long flags) -> Sizer""" return _windows.Dialog_CreateButtonSizer(*args, **kwargs) - def SetModal(*args, **kwargs): - """SetModal(bool flag)""" - return _windows.Dialog_SetModal(*args, **kwargs) - def IsModal(*args, **kwargs): """IsModal() -> bool""" return _windows.Dialog_IsModal(*args, **kwargs) diff --git a/wxPython/src/msw/windows_wrap.cpp b/wxPython/src/msw/windows_wrap.cpp index daae0f6af3..e30a65682e 100644 --- a/wxPython/src/msw/windows_wrap.cpp +++ b/wxPython/src/msw/windows_wrap.cpp @@ -356,9 +356,9 @@ wxRect wxStatusBar_GetFieldRect(wxStatusBar *self,int i){ self->GetFieldRect(i, r); return r; } - static const wxString wxPySplitterNameStr(wxT(wxT("splitter"))); - static const wxString wxPySashNameStr(wxT(wxT("sashWindow"))); - static const wxString wxPySashLayoutNameStr(wxT(wxT("layoutWindow"))); + static const wxString wxPySplitterNameStr(wxT("splitter")); + static const wxString wxPySashNameStr(wxT("sashWindow")); + static const wxString wxPySashLayoutNameStr(wxT("layoutWindow")); #include @@ -782,8 +782,8 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild); #include "wx/wxPython/printfw.h" - static const wxString wxPyPrintoutTitleStr(wxT(wxT("Printout"))); - static const wxString wxPyPreviewCanvasNameStr(wxT(wxT("previewcanvas"))); + static const wxString wxPyPrintoutTitleStr(wxT("Printout")); + static const wxString wxPyPreviewCanvasNameStr(wxT("previewcanvas")); @@ -3660,34 +3660,6 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args, } -static PyObject *_wrap_Dialog_SetModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxDialog *arg1 = (wxDialog *) 0 ; - bool arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "flag", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetModal",kwnames,&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - arg2 = PyInt_AsLong(obj1) ? true : false; - if (PyErr_Occurred()) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetModal(arg2); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDialog *arg1 = (wxDialog *) 0 ; @@ -21141,7 +21113,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Dialog_GetReturnCode", (PyCFunction) _wrap_Dialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS }, { (char *)"Dialog_CreateTextSizer", (PyCFunction) _wrap_Dialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS }, { (char *)"Dialog_CreateButtonSizer", (PyCFunction) _wrap_Dialog_CreateButtonSizer, METH_VARARGS | METH_KEYWORDS }, - { (char *)"Dialog_SetModal", (PyCFunction) _wrap_Dialog_SetModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"Dialog_IsModal", (PyCFunction) _wrap_Dialog_IsModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"Dialog_ShowModal", (PyCFunction) _wrap_Dialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"Dialog_EndModal", (PyCFunction) _wrap_Dialog_EndModal, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/wxPython/controls.py b/wxPython/wxPython/controls.py index d0885b76ad..90d597f4c9 100644 --- a/wxPython/wxPython/controls.py +++ b/wxPython/wxPython/controls.py @@ -147,6 +147,8 @@ wxPreSpinButton = wx.controls.PreSpinButton wxSpinCtrl = wx.controls.SpinCtrl wxSpinCtrlPtr = wx.controls.SpinCtrlPtr wxPreSpinCtrl = wx.controls.PreSpinCtrl +wxSpinEvent = wx.controls.SpinEvent +wxSpinEventPtr = wx.controls.SpinEventPtr wxEVT_COMMAND_SPINCTRL_UPDATED = wx.controls.wxEVT_COMMAND_SPINCTRL_UPDATED wxRadioBoxNameStr = wx.controls.RadioBoxNameStr wxRadioButtonNameStr = wx.controls.RadioButtonNameStr