From 7557b9b54279e438608cdfc28badf348ce8ac2ff Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 29 Jan 2005 01:30:42 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_controls.py | 21 +- wxPython/src/gtk/_controls_wrap.cpp | 45 ++- wxPython/src/gtk/_core.py | 15 +- wxPython/src/gtk/_core_wrap.cpp | 162 +---------- wxPython/src/gtk/_gdi.py | 13 +- wxPython/src/gtk/_gdi_wrap.cpp | 14 +- wxPython/src/gtk/_misc.py | 35 ++- wxPython/src/gtk/_misc_wrap.cpp | 413 +++++++++------------------- wxPython/src/gtk/_windows.py | 10 + wxPython/src/gtk/_windows_wrap.cpp | 140 ++++++++++ wxPython/src/gtk/grid.py | 3 +- wxPython/src/gtk/grid_wrap.cpp | 29 +- 12 files changed, 387 insertions(+), 513 deletions(-) diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py index 335913276b..305d75cc7f 100644 --- a/wxPython/src/gtk/_controls.py +++ b/wxPython/src/gtk/_controls.py @@ -1591,6 +1591,8 @@ TE_HT_BEFORE = _controls_.TE_HT_BEFORE TE_HT_ON_TEXT = _controls_.TE_HT_ON_TEXT TE_HT_BELOW = _controls_.TE_HT_BELOW TE_HT_BEYOND = _controls_.TE_HT_BEYOND +OutOfRangeTextCoord = _controls_.OutOfRangeTextCoord +InvalidTextCoord = _controls_.InvalidTextCoord class TextAttr(object): """Proxy of C++ TextAttr class""" def __repr__(self): @@ -2655,6 +2657,17 @@ def RadioButton_GetClassDefaultAttributes(*args, **kwargs): #--------------------------------------------------------------------------- +SL_HORIZONTAL = _controls_.SL_HORIZONTAL +SL_VERTICAL = _controls_.SL_VERTICAL +SL_AUTOTICKS = _controls_.SL_AUTOTICKS +SL_LABELS = _controls_.SL_LABELS +SL_LEFT = _controls_.SL_LEFT +SL_TOP = _controls_.SL_TOP +SL_RIGHT = _controls_.SL_RIGHT +SL_BOTTOM = _controls_.SL_BOTTOM +SL_BOTH = _controls_.SL_BOTH +SL_SELRANGE = _controls_.SL_SELRANGE +SL_INVERSE = _controls_.SL_INVERSE class Slider(_core.Control): """Proxy of C++ Slider class""" def __repr__(self): @@ -3226,7 +3239,7 @@ EVT_NOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANG class NotebookPage(wx.Panel): """ There is an old (and apparently unsolvable) bug when placing a - window with a nonstandard background colour in a wxNotebook on + window with a nonstandard background colour in a wx.Notebook on wxGTK, as the notbooks's background colour would always be used when the window is refreshed. The solution is to place a panel in the notbook and the coloured window on the panel, sized to cover @@ -3239,7 +3252,7 @@ class NotebookPage(wx.Panel): style=wx.TAB_TRAVERSAL, name="panel"): wx.Panel.__init__(self, parent, id, pos, size, style, name) self.child = None - EVT_SIZE(self, self.OnSize) + self.Bind(wx.EVT_SIZE, self.OnSize) def OnSize(self, evt): if self.child is None: @@ -4423,8 +4436,6 @@ wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT = _controls_.wxEVT_COMMAND_LIST_BEGIN_LABEL_ wxEVT_COMMAND_LIST_END_LABEL_EDIT = _controls_.wxEVT_COMMAND_LIST_END_LABEL_EDIT wxEVT_COMMAND_LIST_DELETE_ITEM = _controls_.wxEVT_COMMAND_LIST_DELETE_ITEM wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS = _controls_.wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS -wxEVT_COMMAND_LIST_GET_INFO = _controls_.wxEVT_COMMAND_LIST_GET_INFO -wxEVT_COMMAND_LIST_SET_INFO = _controls_.wxEVT_COMMAND_LIST_SET_INFO wxEVT_COMMAND_LIST_ITEM_SELECTED = _controls_.wxEVT_COMMAND_LIST_ITEM_SELECTED wxEVT_COMMAND_LIST_ITEM_DESELECTED = _controls_.wxEVT_COMMAND_LIST_ITEM_DESELECTED wxEVT_COMMAND_LIST_KEY_DOWN = _controls_.wxEVT_COMMAND_LIST_KEY_DOWN @@ -4439,6 +4450,8 @@ wxEVT_COMMAND_LIST_COL_BEGIN_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_BEGIN_DRAG wxEVT_COMMAND_LIST_COL_DRAGGING = _controls_.wxEVT_COMMAND_LIST_COL_DRAGGING wxEVT_COMMAND_LIST_COL_END_DRAG = _controls_.wxEVT_COMMAND_LIST_COL_END_DRAG wxEVT_COMMAND_LIST_ITEM_FOCUSED = _controls_.wxEVT_COMMAND_LIST_ITEM_FOCUSED +wxEVT_COMMAND_LIST_GET_INFO = _controls_.wxEVT_COMMAND_LIST_GET_INFO +wxEVT_COMMAND_LIST_SET_INFO = _controls_.wxEVT_COMMAND_LIST_SET_INFO EVT_LIST_BEGIN_DRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_DRAG , 1) EVT_LIST_BEGIN_RDRAG = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_RDRAG , 1) EVT_LIST_BEGIN_LABEL_EDIT = wx.PyEventBinder(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT , 1) diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp index 252ee45816..1a64a95714 100644 --- a/wxPython/src/gtk/_controls_wrap.cpp +++ b/wxPython/src/gtk/_controls_wrap.cpp @@ -1826,7 +1826,7 @@ static void wxToolBarBase_SetToolClientData(wxToolBarBase *self,int id,PyObject #include - static const wxString wxPyListCtrlNameStr(_T("wxListCtrl")); + static const wxString wxPyListCtrlNameStr(wxListCtrlNameStr); static void wxListItemAttr_Destroy(wxListItemAttr *self){ delete self; } // Python aware sorting function for wxPyListCtrl static int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) { @@ -37017,6 +37017,12 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"TE_HT_BEYOND", SWIG_From_int((int)(wxTE_HT_BEYOND))); } + { + PyDict_SetItemString(d,"OutOfRangeTextCoord", SWIG_From_int((int)(wxOutOfRangeTextCoord))); + } + { + PyDict_SetItemString(d,"InvalidTextCoord", SWIG_From_int((int)(wxInvalidTextCoord))); + } PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_UPDATED", PyInt_FromLong(wxEVT_COMMAND_TEXT_UPDATED)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_ENTER", PyInt_FromLong(wxEVT_COMMAND_TEXT_ENTER)); PyDict_SetItemString(d, "wxEVT_COMMAND_TEXT_URL", PyInt_FromLong(wxEVT_COMMAND_TEXT_URL)); @@ -37040,6 +37046,39 @@ SWIGEXPORT(void) SWIG_init(void) { SWIG_addvarlink(SWIG_globals,(char*)"RadioBoxNameStr",_wrap_RadioBoxNameStr_get, _wrap_RadioBoxNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"RadioButtonNameStr",_wrap_RadioButtonNameStr_get, _wrap_RadioButtonNameStr_set); SWIG_addvarlink(SWIG_globals,(char*)"SliderNameStr",_wrap_SliderNameStr_get, _wrap_SliderNameStr_set); + { + PyDict_SetItemString(d,"SL_HORIZONTAL", SWIG_From_int((int)(wxSL_HORIZONTAL))); + } + { + PyDict_SetItemString(d,"SL_VERTICAL", SWIG_From_int((int)(wxSL_VERTICAL))); + } + { + PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_From_int((int)(wxSL_AUTOTICKS))); + } + { + PyDict_SetItemString(d,"SL_LABELS", SWIG_From_int((int)(wxSL_LABELS))); + } + { + PyDict_SetItemString(d,"SL_LEFT", SWIG_From_int((int)(wxSL_LEFT))); + } + { + PyDict_SetItemString(d,"SL_TOP", SWIG_From_int((int)(wxSL_TOP))); + } + { + PyDict_SetItemString(d,"SL_RIGHT", SWIG_From_int((int)(wxSL_RIGHT))); + } + { + PyDict_SetItemString(d,"SL_BOTTOM", SWIG_From_int((int)(wxSL_BOTTOM))); + } + { + PyDict_SetItemString(d,"SL_BOTH", SWIG_From_int((int)(wxSL_BOTH))); + } + { + PyDict_SetItemString(d,"SL_SELRANGE", SWIG_From_int((int)(wxSL_SELRANGE))); + } + { + PyDict_SetItemString(d,"SL_INVERSE", SWIG_From_int((int)(wxSL_INVERSE))); + } SWIG_addvarlink(SWIG_globals,(char*)"ToggleButtonNameStr",_wrap_ToggleButtonNameStr_get, _wrap_ToggleButtonNameStr_set); PyDict_SetItemString(d, "wxEVT_COMMAND_TOGGLEBUTTON_CLICKED", PyInt_FromLong(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)); SWIG_addvarlink(SWIG_globals,(char*)"NotebookNameStr",_wrap_NotebookNameStr_get, _wrap_NotebookNameStr_set); @@ -37368,8 +37407,6 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_END_LABEL_EDIT", PyInt_FromLong(wxEVT_COMMAND_LIST_END_LABEL_EDIT)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_DELETE_ITEM", PyInt_FromLong(wxEVT_COMMAND_LIST_DELETE_ITEM)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS", PyInt_FromLong(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)); - PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_GET_INFO", PyInt_FromLong(wxEVT_COMMAND_LIST_GET_INFO)); - PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_SET_INFO", PyInt_FromLong(wxEVT_COMMAND_LIST_SET_INFO)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_ITEM_SELECTED", PyInt_FromLong(wxEVT_COMMAND_LIST_ITEM_SELECTED)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_ITEM_DESELECTED", PyInt_FromLong(wxEVT_COMMAND_LIST_ITEM_DESELECTED)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_KEY_DOWN", PyInt_FromLong(wxEVT_COMMAND_LIST_KEY_DOWN)); @@ -37384,6 +37421,8 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_COL_DRAGGING", PyInt_FromLong(wxEVT_COMMAND_LIST_COL_DRAGGING)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_COL_END_DRAG", PyInt_FromLong(wxEVT_COMMAND_LIST_COL_END_DRAG)); PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_ITEM_FOCUSED", PyInt_FromLong(wxEVT_COMMAND_LIST_ITEM_FOCUSED)); + PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_GET_INFO", PyInt_FromLong(wxEVT_COMMAND_LIST_GET_INFO)); + PyDict_SetItemString(d, "wxEVT_COMMAND_LIST_SET_INFO", PyInt_FromLong(wxEVT_COMMAND_LIST_SET_INFO)); // Map renamed classes back to their common name for OOR wxPyPtrTypeMap_Add("wxListCtrl", "wxPyListCtrl"); diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index c28b5dfc79..1c5b514116 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -123,16 +123,6 @@ RA_SPECIFY_ROWS = _core_.RA_SPECIFY_ROWS RA_SPECIFY_COLS = _core_.RA_SPECIFY_COLS RB_GROUP = _core_.RB_GROUP RB_SINGLE = _core_.RB_SINGLE -SL_HORIZONTAL = _core_.SL_HORIZONTAL -SL_VERTICAL = _core_.SL_VERTICAL -SL_AUTOTICKS = _core_.SL_AUTOTICKS -SL_LABELS = _core_.SL_LABELS -SL_LEFT = _core_.SL_LEFT -SL_TOP = _core_.SL_TOP -SL_RIGHT = _core_.SL_RIGHT -SL_BOTTOM = _core_.SL_BOTTOM -SL_BOTH = _core_.SL_BOTH -SL_SELRANGE = _core_.SL_SELRANGE SB_HORIZONTAL = _core_.SB_HORIZONTAL SB_VERTICAL = _core_.SB_VERTICAL ST_SIZEGRIP = _core_.ST_SIZEGRIP @@ -3953,8 +3943,9 @@ class MoveEvent(Event): """SetPosition(self, Point pos)""" return _core_.MoveEvent_SetPosition(*args, **kwargs) - m_pos = property(_core_.MoveEvent_m_pos_get, _core_.MoveEvent_m_pos_set) - m_rect = property(_core_.MoveEvent_m_rect_get, _core_.MoveEvent_m_rect_set) + m_pos = property(GetPosition, SetPosition) + m_rect = property(GetRect, SetRect) + class MoveEventPtr(MoveEvent): def __init__(self, this): diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index a69a4cd8fc..f5500ac643 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -1659,6 +1659,11 @@ static wxPyCoreAPI API = { #endif +#if !WXWIN_COMPATIBILITY_2_4 + #define wxHIDE_READONLY 0 +#endif + + /*@/opt/swig/share/swig/1.3.24/python/pymacros.swg,66,SWIG_define@*/ #define SWIG_From_int PyInt_FromLong /*@@*/ @@ -2575,9 +2580,6 @@ SWIG_Check_unsigned_SS_int(PyObject* obj) static void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){ self->m_size = size; } -static void wxMoveEvent_SetPosition(wxMoveEvent *self,wxPoint pos){ - self->m_pos = pos; - } static PyObject *wxDropFilesEvent_GetFiles(wxDropFilesEvent *self){ int count = self->GetNumberOfFiles(); wxString* files = self->GetFiles(); @@ -18930,7 +18932,8 @@ static PyObject *_wrap_MoveEvent_GetRect(PyObject *, PyObject *args, PyObject *k static PyObject *_wrap_MoveEvent_SetRect(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMoveEvent *arg1 = (wxMoveEvent *) 0 ; - wxRect arg2 ; + wxRect *arg2 = 0 ; + wxRect temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -18941,18 +18944,12 @@ static PyObject *_wrap_MoveEvent_SetRect(PyObject *, PyObject *args, PyObject *k SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - wxRect * argp; - SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION); - if (SWIG_arg_fail(2)) SWIG_fail; - if (argp == NULL) { - SWIG_null_ref("wxRect"); - } - if (SWIG_arg_fail(2)) SWIG_fail; - arg2 = *argp; + arg2 = &temp2; + if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->SetRect(arg2); + (arg1)->SetRect((wxRect const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -18967,7 +18964,8 @@ static PyObject *_wrap_MoveEvent_SetRect(PyObject *, PyObject *args, PyObject *k static PyObject *_wrap_MoveEvent_SetPosition(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMoveEvent *arg1 = (wxMoveEvent *) 0 ; - wxPoint arg2 ; + wxPoint *arg2 = 0 ; + wxPoint temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; char *kwnames[] = { @@ -18978,18 +18976,12 @@ static PyObject *_wrap_MoveEvent_SetPosition(PyObject *, PyObject *args, PyObjec SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0); if (SWIG_arg_fail(1)) SWIG_fail; { - wxPoint * argp; - SWIG_Python_ConvertPtr(obj1, (void **)&argp, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION); - if (SWIG_arg_fail(2)) SWIG_fail; - if (argp == NULL) { - SWIG_null_ref("wxPoint"); - } - if (SWIG_arg_fail(2)) SWIG_fail; - arg2 = *argp; + arg2 = &temp2; + if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxMoveEvent_SetPosition(arg1,arg2); + (arg1)->SetPosition((wxPoint const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -19001,96 +18993,6 @@ static PyObject *_wrap_MoveEvent_SetPosition(PyObject *, PyObject *args, PyObjec } -static PyObject *_wrap_MoveEvent_m_pos_set(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxMoveEvent *arg1 = (wxMoveEvent *) 0 ; - wxPoint *arg2 = (wxPoint *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_pos", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MoveEvent_m_pos_set",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - if (arg1) (arg1)->m_pos = *arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_MoveEvent_m_pos_get(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxMoveEvent *arg1 = (wxMoveEvent *) 0 ; - wxPoint *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MoveEvent_m_pos_get",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - result = (wxPoint *)& ((arg1)->m_pos); - - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 0); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_MoveEvent_m_rect_set(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxMoveEvent *arg1 = (wxMoveEvent *) 0 ; - wxRect *arg2 = (wxRect *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_rect", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MoveEvent_m_rect_set",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxRect, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - if (arg1) (arg1)->m_rect = *arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_MoveEvent_m_rect_get(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxMoveEvent *arg1 = (wxMoveEvent *) 0 ; - wxRect *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MoveEvent_m_rect_get",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMoveEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - result = (wxRect *)& ((arg1)->m_rect); - - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxRect, 0); - return resultobj; - fail: - return NULL; -} - - static PyObject * MoveEvent_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -44422,10 +44324,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"MoveEvent_GetRect", (PyCFunction) _wrap_MoveEvent_GetRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MoveEvent_SetRect", (PyCFunction) _wrap_MoveEvent_SetRect, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MoveEvent_SetPosition", (PyCFunction) _wrap_MoveEvent_SetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MoveEvent_m_pos_set", (PyCFunction) _wrap_MoveEvent_m_pos_set, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MoveEvent_m_pos_get", (PyCFunction) _wrap_MoveEvent_m_pos_get, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MoveEvent_m_rect_set", (PyCFunction) _wrap_MoveEvent_m_rect_set, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"MoveEvent_m_rect_get", (PyCFunction) _wrap_MoveEvent_m_rect_get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MoveEvent_swigregister", MoveEvent_swigregister, METH_VARARGS, NULL}, { (char *)"new_PaintEvent", (PyCFunction) _wrap_new_PaintEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PaintEvent_swigregister", PaintEvent_swigregister, METH_VARARGS, NULL}, @@ -46455,36 +46353,6 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"RB_SINGLE", SWIG_From_int((int)(wxRB_SINGLE))); } - { - PyDict_SetItemString(d,"SL_HORIZONTAL", SWIG_From_int((int)(wxSL_HORIZONTAL))); - } - { - PyDict_SetItemString(d,"SL_VERTICAL", SWIG_From_int((int)(wxSL_VERTICAL))); - } - { - PyDict_SetItemString(d,"SL_AUTOTICKS", SWIG_From_int((int)(wxSL_AUTOTICKS))); - } - { - PyDict_SetItemString(d,"SL_LABELS", SWIG_From_int((int)(wxSL_LABELS))); - } - { - PyDict_SetItemString(d,"SL_LEFT", SWIG_From_int((int)(wxSL_LEFT))); - } - { - PyDict_SetItemString(d,"SL_TOP", SWIG_From_int((int)(wxSL_TOP))); - } - { - PyDict_SetItemString(d,"SL_RIGHT", SWIG_From_int((int)(wxSL_RIGHT))); - } - { - PyDict_SetItemString(d,"SL_BOTTOM", SWIG_From_int((int)(wxSL_BOTTOM))); - } - { - PyDict_SetItemString(d,"SL_BOTH", SWIG_From_int((int)(wxSL_BOTH))); - } - { - PyDict_SetItemString(d,"SL_SELRANGE", SWIG_From_int((int)(wxSL_SELRANGE))); - } { PyDict_SetItemString(d,"SB_HORIZONTAL", SWIG_From_int((int)(wxSB_HORIZONTAL))); } diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index 91751a35db..c7ceb2f500 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -997,11 +997,8 @@ class Cursor(GDIObject): __init__(self, String cursorName, long type, int hotSpotX=0, int hotSpotY=0) -> Cursor Construct a Cursor from a file. Specify the type of file using - wx.BITAMP_TYPE* constants, and specify the hotspot if not using a cur + wx.BITAMP_TYPE* constants, and specify the hotspot if not using a .cur file. - - This constructor is not available on wxGTK, use ``wx.StockCursor``, - ``wx.CursorFromImage``, or ``wx.CursorFromBits`` instead. """ newobj = _gdi_.new_Cursor(*args, **kwargs) self.this = newobj.this @@ -1031,7 +1028,7 @@ def StockCursor(*args, **kwargs): StockCursor(int id) -> Cursor Create a cursor using one of the stock cursors. Note that not all - cursors are available on all platforms. + stock cursors are available on all platforms. """ val = _gdi_.new_StockCursor(*args, **kwargs) val.thisown = 1 @@ -1041,10 +1038,8 @@ def CursorFromImage(*args, **kwargs): """ CursorFromImage(Image image) -> Cursor - Constructs a cursor from a wxImage. The cursor is monochrome, colors - with the RGB elements all greater than 127 will be foreground, colors - less than this background. The mask (if any) will be used as - transparent. + Constructs a cursor from a `wx.Image`. The mask (if any) will be used + as transparent. """ val = _gdi_.new_CursorFromImage(*args, **kwargs) val.thisown = 1 diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index b7964a02cf..95ab0723d4 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -1872,12 +1872,14 @@ SWIG_Check_long(PyObject* obj) return SWIG_AsVal_long(obj, (long*)0); } -static wxCursor *new_wxCursor(wxString const *cursorName,long type,int hotSpotX=0,int hotSpotY=0){ +static wxCursor *new_wxCursor(wxString const &cursorName,long type,int hotSpotX=0,int hotSpotY=0){ #ifdef __WXGTK__ - wxCHECK_MSG(false, NULL, - wxT("wx.Cursor constructor not implemented for wxGTK, use wx.StockCursor, wx.CursorFromImage, or wx.CursorFromBits instead.")); + wxImage img(cursorName, type); + img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX); + img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY); + return new wxCursor(img); #else - return new wxCursor(*cursorName, type, hotSpotX, hotSpotY); + return new wxCursor(cursorName, type, hotSpotX, hotSpotY); #endif } @@ -5897,7 +5899,7 @@ static PyObject * IconBundle_swigregister(PyObject *, PyObject *args) { } static PyObject *_wrap_new_Cursor(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxString *arg1 = (wxString *) 0 ; + wxString *arg1 = 0 ; long arg2 ; int arg3 = (int) 0 ; int arg4 = (int) 0 ; @@ -5936,7 +5938,7 @@ static PyObject *_wrap_new_Cursor(PyObject *, PyObject *args, PyObject *kwargs) { if (!wxPyCheckForApp()) SWIG_fail; PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxCursor *)new_wxCursor((wxString const *)arg1,arg2,arg3,arg4); + result = (wxCursor *)new_wxCursor((wxString const &)*arg1,arg2,arg3,arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index 84eaf95775..1c94686a68 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -2019,11 +2019,6 @@ class JoystickEvent(_core.Event): """Proxy of C++ JoystickEvent class""" def __repr__(self): return "<%s.%s; proxy of C++ wxJoystickEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - m_pos = property(_misc_.JoystickEvent_m_pos_get, _misc_.JoystickEvent_m_pos_set) - m_zPosition = property(_misc_.JoystickEvent_m_zPosition_get, _misc_.JoystickEvent_m_zPosition_set) - m_buttonChange = property(_misc_.JoystickEvent_m_buttonChange_get, _misc_.JoystickEvent_m_buttonChange_set) - m_buttonState = property(_misc_.JoystickEvent_m_buttonState_get, _misc_.JoystickEvent_m_buttonState_set) - m_joyStick = property(_misc_.JoystickEvent_m_joyStick_get, _misc_.JoystickEvent_m_joyStick_set) def __init__(self, *args, **kwargs): """ __init__(self, wxEventType type=wxEVT_NULL, int state=0, int joystick=JOYSTICK1, @@ -2097,6 +2092,12 @@ class JoystickEvent(_core.Event): """ButtonIsDown(self, int but=JOY_BUTTON_ANY) -> bool""" return _misc_.JoystickEvent_ButtonIsDown(*args, **kwargs) + m_pos = property(GetPosition, SetPosition) + m_zPosition = property(GetZPosition, SetZPosition) + m_buttonChange = property(GetButtonChange, SetButtonChange) + m_buttonState = property(GetButtonState, SetButtonState) + m_joyStick = property(GetJoystick, SetJoystick) + class JoystickEventPtr(JoystickEvent): def __init__(self, this): @@ -3759,7 +3760,7 @@ class DateTime(object): return _misc_.DateTime_ParseRfc822Date(*args, **kwargs) def ParseFormat(*args, **kwargs): - """ParseFormat(self, String date, String format=DateFormatStr, DateTime dateDef=DefaultDateTime) -> int""" + """ParseFormat(self, String date, String format=DefaultDateTimeFormat, DateTime dateDef=DefaultDateTime) -> int""" return _misc_.DateTime_ParseFormat(*args, **kwargs) def ParseDateTime(*args, **kwargs): @@ -3775,7 +3776,7 @@ class DateTime(object): return _misc_.DateTime_ParseTime(*args, **kwargs) def Format(*args, **kwargs): - """Format(self, String format=DateFormatStr, wxDateTime::TimeZone tz=LOCAL_TZ) -> String""" + """Format(self, String format=DefaultDateTimeFormat, wxDateTime::TimeZone tz=LOCAL_TZ) -> String""" return _misc_.DateTime_Format(*args, **kwargs) def FormatDate(*args, **kwargs): @@ -3812,8 +3813,8 @@ class DateTimePtr(DateTime): if not hasattr(self,"thisown"): self.thisown = 0 self.__class__ = DateTime _misc_.DateTime_swigregister(DateTimePtr) -DateFormatStr = cvar.DateFormatStr -TimeSpanFormatStr = cvar.TimeSpanFormatStr +DefaultDateTimeFormat = cvar.DefaultDateTimeFormat +DefaultTimeSpanFormat = cvar.DefaultTimeSpanFormat def DateTime_SetCountry(*args, **kwargs): """DateTime_SetCountry(int country)""" @@ -4117,7 +4118,7 @@ class TimeSpan(object): return _misc_.TimeSpan_GetMilliseconds(*args, **kwargs) def Format(*args, **kwargs): - """Format(self, String format=TimeSpanFormatStr) -> String""" + """Format(self, String format=DefaultTimeSpanFormat) -> String""" return _misc_.TimeSpan_Format(*args, **kwargs) def __repr__(self): @@ -4965,12 +4966,6 @@ class FileDataObject(DataObjectSimple): Explorer and other compatible programs under Windows or GNOME/KDE filemanager under Unix which makes it possible to receive files from them using this class. - - :Warning: Under all non-Windows platforms this class is currently - "input-only", i.e. you can receive the files from another - application, but copying (or dragging) file(s) from a wxWidgets - application is not currently supported. - """ def __repr__(self): return "<%s.%s; proxy of C++ wxFileDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) @@ -5014,9 +5009,11 @@ class CustomDataObject(DataObjectSimple): """ def __repr__(self): return "<%s.%s; proxy of C++ wxCustomDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args, **kwargs): + def __init__(self, *args): """ - __init__(self, DataFormat format=FormatInvalid) -> CustomDataObject + __init__(self, DataFormat format) -> CustomDataObject + __init__(self, String formatName) -> CustomDataObject + __init__(self) -> CustomDataObject wx.CustomDataObject is a specialization of `wx.DataObjectSimple` for some application-specific data in arbitrary format. Python strings @@ -5024,7 +5021,7 @@ class CustomDataObject(DataObjectSimple): easily be transfered via strings. A copy of the data is stored in the data object. """ - newobj = _misc_.new_CustomDataObject(*args, **kwargs) + newobj = _misc_.new_CustomDataObject(*args) self.this = newobj.this self.thisown = 1 del newobj.thisown diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp index 877e38c12e..fbae2c2dec 100644 --- a/wxPython/src/gtk/_misc_wrap.cpp +++ b/wxPython/src/gtk/_misc_wrap.cpp @@ -2415,9 +2415,8 @@ static bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool de #include - - static const wxString wxPyDateFormatStr(wxT("%c")); - static const wxString wxPyTimeSpanFormatStr(wxT("%H:%M:%S")); + static const wxString wxPyDefaultDateTimeFormat(wxDefaultDateTimeFormat); + static const wxString wxPyDefaultTimeSpanFormat(wxDefaultTimeSpanFormat); #define LOCAL_TZ wxDateTime::Local @@ -2468,7 +2467,7 @@ static int wxDateTime_ParseRfc822Date(wxDateTime *self,wxString const &date){ if (rv == NULL) return -1; return rv - _date; } -static int wxDateTime_ParseFormat(wxDateTime *self,wxString const &date,wxString const &format=wxPyDateFormatStr,wxDateTime const &dateDef=wxDefaultDateTime){ +static int wxDateTime_ParseFormat(wxDateTime *self,wxString const &date,wxString const &format=wxPyDefaultDateTimeFormat,wxDateTime const &dateDef=wxDefaultDateTime){ const wxChar* rv; const wxChar* _date = date; rv = self->ParseFormat(_date, format, dateDef); @@ -2699,6 +2698,9 @@ void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) { wxPyEndBlockThreads(blocked); } +static wxCustomDataObject *new_wxCustomDataObject__SWIG_1(wxString const &formatName){ + return new wxCustomDataObject(wxDataFormat(formatName)); + } static bool wxCustomDataObject_SetData(wxCustomDataObject *self,PyObject *data){ bool rval; bool blocked = wxPyBeginBlockThreads(); @@ -12614,247 +12616,6 @@ static PyObject * Joystick_swigregister(PyObject *, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_JoystickEvent_m_pos_set(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; - wxPoint *arg2 = (wxPoint *) 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_pos", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_pos_set",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxJoystickEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - SWIG_Python_ConvertPtr(obj1, (void **)&arg2, SWIGTYPE_p_wxPoint, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(2)) SWIG_fail; - if (arg1) (arg1)->m_pos = *arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_JoystickEvent_m_pos_get(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; - wxPoint *result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:JoystickEvent_m_pos_get",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxJoystickEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - result = (wxPoint *)& ((arg1)->m_pos); - - resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPoint, 0); - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_JoystickEvent_m_zPosition_set(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; - int arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_zPosition", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_zPosition_set",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxJoystickEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (int)(SWIG_As_int(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - if (arg1) (arg1)->m_zPosition = arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_JoystickEvent_m_zPosition_get(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:JoystickEvent_m_zPosition_get",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxJoystickEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - result = (int) ((arg1)->m_zPosition); - - { - resultobj = SWIG_From_int((int)(result)); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_JoystickEvent_m_buttonChange_set(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; - int arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_buttonChange", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_buttonChange_set",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxJoystickEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (int)(SWIG_As_int(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - if (arg1) (arg1)->m_buttonChange = arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_JoystickEvent_m_buttonChange_get(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:JoystickEvent_m_buttonChange_get",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxJoystickEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - result = (int) ((arg1)->m_buttonChange); - - { - resultobj = SWIG_From_int((int)(result)); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_JoystickEvent_m_buttonState_set(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; - int arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_buttonState", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_buttonState_set",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxJoystickEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (int)(SWIG_As_int(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - if (arg1) (arg1)->m_buttonState = arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_JoystickEvent_m_buttonState_get(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:JoystickEvent_m_buttonState_get",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxJoystickEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - result = (int) ((arg1)->m_buttonState); - - { - resultobj = SWIG_From_int((int)(result)); - } - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_JoystickEvent_m_joyStick_set(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; - int arg2 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "self",(char *) "m_joyStick", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:JoystickEvent_m_joyStick_set",kwnames,&obj0,&obj1)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxJoystickEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - { - arg2 = (int)(SWIG_As_int(obj1)); - if (SWIG_arg_fail(2)) SWIG_fail; - } - if (arg1) (arg1)->m_joyStick = arg2; - - Py_INCREF(Py_None); resultobj = Py_None; - return resultobj; - fail: - return NULL; -} - - -static PyObject *_wrap_JoystickEvent_m_joyStick_get(PyObject *, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxJoystickEvent *arg1 = (wxJoystickEvent *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:JoystickEvent_m_joyStick_get",kwnames,&obj0)) goto fail; - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxJoystickEvent, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - result = (int) ((arg1)->m_joyStick); - - { - resultobj = SWIG_From_int((int)(result)); - } - return resultobj; - fail: - return NULL; -} - - static PyObject *_wrap_new_JoystickEvent(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxEventType arg1 = (wxEventType) wxEVT_NULL ; @@ -18715,40 +18476,40 @@ static PyObject *_wrap_ExpandEnvVars(PyObject *, PyObject *args, PyObject *kwarg } -static int _wrap_DateFormatStr_set(PyObject *) { - PyErr_SetString(PyExc_TypeError,"Variable DateFormatStr is read-only."); +static int _wrap_DefaultDateTimeFormat_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable DefaultDateTimeFormat is read-only."); return 1; } -static PyObject *_wrap_DateFormatStr_get(void) { +static PyObject *_wrap_DefaultDateTimeFormat_get(void) { PyObject *pyobj; { #if wxUSE_UNICODE - pyobj = PyUnicode_FromWideChar((&wxPyDateFormatStr)->c_str(), (&wxPyDateFormatStr)->Len()); + pyobj = PyUnicode_FromWideChar((&wxPyDefaultDateTimeFormat)->c_str(), (&wxPyDefaultDateTimeFormat)->Len()); #else - pyobj = PyString_FromStringAndSize((&wxPyDateFormatStr)->c_str(), (&wxPyDateFormatStr)->Len()); + pyobj = PyString_FromStringAndSize((&wxPyDefaultDateTimeFormat)->c_str(), (&wxPyDefaultDateTimeFormat)->Len()); #endif } return pyobj; } -static int _wrap_TimeSpanFormatStr_set(PyObject *) { - PyErr_SetString(PyExc_TypeError,"Variable TimeSpanFormatStr is read-only."); +static int _wrap_DefaultTimeSpanFormat_set(PyObject *) { + PyErr_SetString(PyExc_TypeError,"Variable DefaultTimeSpanFormat is read-only."); return 1; } -static PyObject *_wrap_TimeSpanFormatStr_get(void) { +static PyObject *_wrap_DefaultTimeSpanFormat_get(void) { PyObject *pyobj; { #if wxUSE_UNICODE - pyobj = PyUnicode_FromWideChar((&wxPyTimeSpanFormatStr)->c_str(), (&wxPyTimeSpanFormatStr)->Len()); + pyobj = PyUnicode_FromWideChar((&wxPyDefaultTimeSpanFormat)->c_str(), (&wxPyDefaultTimeSpanFormat)->Len()); #else - pyobj = PyString_FromStringAndSize((&wxPyTimeSpanFormatStr)->c_str(), (&wxPyTimeSpanFormatStr)->Len()); + pyobj = PyString_FromStringAndSize((&wxPyDefaultTimeSpanFormat)->c_str(), (&wxPyDefaultTimeSpanFormat)->Len()); #endif } return pyobj; @@ -23183,7 +22944,7 @@ static PyObject *_wrap_DateTime_ParseFormat(PyObject *, PyObject *args, PyObject PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; wxString *arg2 = 0 ; - wxString const &arg3_defvalue = wxPyDateFormatStr ; + wxString const &arg3_defvalue = wxPyDefaultDateTimeFormat ; wxString *arg3 = (wxString *) &arg3_defvalue ; wxDateTime const &arg4_defvalue = wxDefaultDateTime ; wxDateTime *arg4 = (wxDateTime *) &arg4_defvalue ; @@ -23390,7 +23151,7 @@ static PyObject *_wrap_DateTime_ParseTime(PyObject *, PyObject *args, PyObject * static PyObject *_wrap_DateTime_Format(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxDateTime *arg1 = (wxDateTime *) 0 ; - wxString const &arg2_defvalue = wxPyDateFormatStr ; + wxString const &arg2_defvalue = wxPyDefaultDateTimeFormat ; wxString *arg2 = (wxString *) &arg2_defvalue ; wxDateTime::TimeZone const &arg3_defvalue = LOCAL_TZ ; wxDateTime::TimeZone *arg3 = (wxDateTime::TimeZone *) &arg3_defvalue ; @@ -25003,7 +24764,7 @@ static PyObject *_wrap_TimeSpan_GetMilliseconds(PyObject *, PyObject *args, PyOb static PyObject *_wrap_TimeSpan_Format(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxTimeSpan *arg1 = (wxTimeSpan *) 0 ; - wxString const &arg2_defvalue = wxPyTimeSpanFormatStr ; + wxString const &arg2_defvalue = wxPyDefaultTimeSpanFormat ; wxString *arg2 = (wxString *) &arg2_defvalue ; wxString result; bool temp2 = false ; @@ -27907,26 +27668,20 @@ static PyObject * FileDataObject_swigregister(PyObject *, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_CustomDataObject(PyObject *, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_CustomDataObject__SWIG_0(PyObject *, PyObject *args) { PyObject *resultobj; - wxDataFormat const &arg1_defvalue = wxFormatInvalid ; - wxDataFormat *arg1 = (wxDataFormat *) &arg1_defvalue ; + wxDataFormat *arg1 = 0 ; wxCustomDataObject *result; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "format", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|O:new_CustomDataObject",kwnames,&obj0)) goto fail; - if (obj0) { - { - SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDataFormat, SWIG_POINTER_EXCEPTION | 0); - if (SWIG_arg_fail(1)) SWIG_fail; - if (arg1 == NULL) { - SWIG_null_ref("wxDataFormat"); - } - if (SWIG_arg_fail(1)) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"O:new_CustomDataObject",&obj0)) goto fail; + { + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxDataFormat, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (arg1 == NULL) { + SWIG_null_ref("wxDataFormat"); } + if (SWIG_arg_fail(1)) SWIG_fail; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); @@ -27942,6 +27697,102 @@ static PyObject *_wrap_new_CustomDataObject(PyObject *, PyObject *args, PyObject } +static PyObject *_wrap_new_CustomDataObject__SWIG_1(PyObject *, PyObject *args) { + PyObject *resultobj; + wxString *arg1 = 0 ; + wxCustomDataObject *result; + bool temp1 = false ; + PyObject * obj0 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O:new_CustomDataObject",&obj0)) goto fail; + { + arg1 = wxString_in_helper(obj0); + if (arg1 == NULL) SWIG_fail; + temp1 = true; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxCustomDataObject *)new_wxCustomDataObject__SWIG_1((wxString const &)*arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCustomDataObject, 1); + { + if (temp1) + delete arg1; + } + return resultobj; + fail: + { + if (temp1) + delete arg1; + } + return NULL; +} + + +static PyObject *_wrap_new_CustomDataObject__SWIG_2(PyObject *, PyObject *args) { + PyObject *resultobj; + wxCustomDataObject *result; + + if(!PyArg_ParseTuple(args,(char *)":new_CustomDataObject")) goto fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxCustomDataObject *)new wxCustomDataObject(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCustomDataObject, 1); + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_new_CustomDataObject(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[2]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 1); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if (argc == 0) { + return _wrap_new_CustomDataObject__SWIG_2(self,args); + } + if (argc == 1) { + int _v; + { + _v = PyString_Check(argv[0]) || PyUnicode_Check(argv[0]); + } + if (_v) { + return _wrap_new_CustomDataObject__SWIG_1(self,args); + } + } + if (argc == 1) { + int _v; + { + void *ptr = 0; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxDataFormat, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = (ptr != 0); + } + } + if (_v) { + return _wrap_new_CustomDataObject__SWIG_0(self,args); + } + } + + PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'new_CustomDataObject'"); + return NULL; +} + + static PyObject *_wrap_CustomDataObject_SetData(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxCustomDataObject *arg1 = (wxCustomDataObject *) 0 ; @@ -31353,16 +31204,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"Joystick_SetCapture", (PyCFunction) _wrap_Joystick_SetCapture, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Joystick_ReleaseCapture", (PyCFunction) _wrap_Joystick_ReleaseCapture, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"Joystick_swigregister", Joystick_swigregister, METH_VARARGS, NULL}, - { (char *)"JoystickEvent_m_pos_set", (PyCFunction) _wrap_JoystickEvent_m_pos_set, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"JoystickEvent_m_pos_get", (PyCFunction) _wrap_JoystickEvent_m_pos_get, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"JoystickEvent_m_zPosition_set", (PyCFunction) _wrap_JoystickEvent_m_zPosition_set, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"JoystickEvent_m_zPosition_get", (PyCFunction) _wrap_JoystickEvent_m_zPosition_get, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"JoystickEvent_m_buttonChange_set", (PyCFunction) _wrap_JoystickEvent_m_buttonChange_set, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"JoystickEvent_m_buttonChange_get", (PyCFunction) _wrap_JoystickEvent_m_buttonChange_get, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"JoystickEvent_m_buttonState_set", (PyCFunction) _wrap_JoystickEvent_m_buttonState_set, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"JoystickEvent_m_buttonState_get", (PyCFunction) _wrap_JoystickEvent_m_buttonState_get, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"JoystickEvent_m_joyStick_set", (PyCFunction) _wrap_JoystickEvent_m_joyStick_set, METH_VARARGS | METH_KEYWORDS, NULL}, - { (char *)"JoystickEvent_m_joyStick_get", (PyCFunction) _wrap_JoystickEvent_m_joyStick_get, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"new_JoystickEvent", (PyCFunction) _wrap_new_JoystickEvent, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"JoystickEvent_GetPosition", (PyCFunction) _wrap_JoystickEvent_GetPosition, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"JoystickEvent_GetZPosition", (PyCFunction) _wrap_JoystickEvent_GetZPosition, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -31746,7 +31587,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"FileDataObject_GetFilenames", (PyCFunction) _wrap_FileDataObject_GetFilenames, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"FileDataObject_AddFile", (PyCFunction) _wrap_FileDataObject_AddFile, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"FileDataObject_swigregister", FileDataObject_swigregister, METH_VARARGS, NULL}, - { (char *)"new_CustomDataObject", (PyCFunction) _wrap_new_CustomDataObject, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_CustomDataObject", _wrap_new_CustomDataObject, METH_VARARGS, NULL}, { (char *)"CustomDataObject_SetData", (PyCFunction) _wrap_CustomDataObject_SetData, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CustomDataObject_GetSize", (PyCFunction) _wrap_CustomDataObject_GetSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"CustomDataObject_GetData", (PyCFunction) _wrap_CustomDataObject_GetData, METH_VARARGS | METH_KEYWORDS, NULL}, @@ -33480,8 +33321,8 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"ConfigBase_Type_Float", SWIG_From_int((int)(wxConfigBase::Type_Float))); } - SWIG_addvarlink(SWIG_globals,(char*)"DateFormatStr",_wrap_DateFormatStr_get, _wrap_DateFormatStr_set); - SWIG_addvarlink(SWIG_globals,(char*)"TimeSpanFormatStr",_wrap_TimeSpanFormatStr_get, _wrap_TimeSpanFormatStr_set); + SWIG_addvarlink(SWIG_globals,(char*)"DefaultDateTimeFormat",_wrap_DefaultDateTimeFormat_get, _wrap_DefaultDateTimeFormat_set); + SWIG_addvarlink(SWIG_globals,(char*)"DefaultTimeSpanFormat",_wrap_DefaultTimeSpanFormat_get, _wrap_DefaultTimeSpanFormat_set); { PyDict_SetItemString(d,"DateTime_Local", SWIG_From_int((int)(wxDateTime::Local))); } diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index bdddbb4350..bad585f88d 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -4073,6 +4073,7 @@ class PageSetupDialogData(_core.Object): """ __init__(self) -> PageSetupDialogData __init__(self, PageSetupDialogData data) -> PageSetupDialogData + __init__(self, PrintData data) -> PageSetupDialogData """ newobj = _windows_.new_PageSetupDialogData(*args) self.this = newobj.this @@ -4200,6 +4201,14 @@ class PageSetupDialogData(_core.Object): """SetPrintData(self, PrintData printData)""" return _windows_.PageSetupDialogData_SetPrintData(*args, **kwargs) + def CalculateIdFromPaperSize(*args, **kwargs): + """CalculateIdFromPaperSize(self)""" + return _windows_.PageSetupDialogData_CalculateIdFromPaperSize(*args, **kwargs) + + def CalculatePaperSizeFromId(*args, **kwargs): + """CalculatePaperSizeFromId(self)""" + return _windows_.PageSetupDialogData_CalculatePaperSizeFromId(*args, **kwargs) + def __nonzero__(self): return self.Ok() class PageSetupDialogDataPtr(PageSetupDialogData): @@ -4247,6 +4256,7 @@ class PrintDialogData(_core.Object): """ __init__(self) -> PrintDialogData __init__(self, PrintData printData) -> PrintDialogData + __init__(self, PrintDialogData printData) -> PrintDialogData """ newobj = _windows_.new_PrintDialogData(*args) self.this = newobj.this diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp index 0e19a0d457..0c74c9d549 100644 --- a/wxPython/src/gtk/_windows_wrap.cpp +++ b/wxPython/src/gtk/_windows_wrap.cpp @@ -21784,6 +21784,35 @@ static PyObject *_wrap_new_PageSetupDialogData__SWIG_1(PyObject *, PyObject *arg } +static PyObject *_wrap_new_PageSetupDialogData__SWIG_2(PyObject *, PyObject *args) { + PyObject *resultobj; + wxPrintData *arg1 = 0 ; + wxPageSetupDialogData *result; + PyObject * obj0 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O:new_PageSetupDialogData",&obj0)) goto fail; + { + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (arg1 == NULL) { + SWIG_null_ref("wxPrintData"); + } + if (SWIG_arg_fail(1)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxPageSetupDialogData *)new wxPageSetupDialogData((wxPrintData const &)*arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPageSetupDialogData, 1); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_PageSetupDialogData(PyObject *self, PyObject *args) { int argc; PyObject *argv[2]; @@ -21811,6 +21840,21 @@ static PyObject *_wrap_new_PageSetupDialogData(PyObject *self, PyObject *args) { return _wrap_new_PageSetupDialogData__SWIG_1(self,args); } } + if (argc == 1) { + int _v; + { + void *ptr = 0; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPrintData, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = (ptr != 0); + } + } + if (_v) { + return _wrap_new_PageSetupDialogData__SWIG_2(self,args); + } + } PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'new_PageSetupDialogData'"); return NULL; @@ -22714,6 +22758,56 @@ static PyObject *_wrap_PageSetupDialogData_SetPrintData(PyObject *, PyObject *ar } +static PyObject *_wrap_PageSetupDialogData_CalculateIdFromPaperSize(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PageSetupDialogData_CalculateIdFromPaperSize",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->CalculateIdFromPaperSize(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_PageSetupDialogData_CalculatePaperSizeFromId(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxPageSetupDialogData *arg1 = (wxPageSetupDialogData *) 0 ; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:PageSetupDialogData_CalculatePaperSizeFromId",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPageSetupDialogData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + (arg1)->CalculatePaperSizeFromId(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + Py_INCREF(Py_None); resultobj = Py_None; + return resultobj; + fail: + return NULL; +} + + static PyObject * PageSetupDialogData_swigregister(PyObject *, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -22895,6 +22989,35 @@ static PyObject *_wrap_new_PrintDialogData__SWIG_1(PyObject *, PyObject *args) { } +static PyObject *_wrap_new_PrintDialogData__SWIG_2(PyObject *, PyObject *args) { + PyObject *resultobj; + wxPrintDialogData *arg1 = 0 ; + wxPrintDialogData *result; + PyObject * obj0 = 0 ; + + if(!PyArg_ParseTuple(args,(char *)"O:new_PrintDialogData",&obj0)) goto fail; + { + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxPrintDialogData, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + if (arg1 == NULL) { + SWIG_null_ref("wxPrintDialogData"); + } + if (SWIG_arg_fail(1)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxPrintDialogData *)new wxPrintDialogData((wxPrintDialogData const &)*arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPrintDialogData, 1); + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_new_PrintDialogData(PyObject *self, PyObject *args) { int argc; PyObject *argv[2]; @@ -22922,6 +23045,21 @@ static PyObject *_wrap_new_PrintDialogData(PyObject *self, PyObject *args) { return _wrap_new_PrintDialogData__SWIG_1(self,args); } } + if (argc == 1) { + int _v; + { + void *ptr = 0; + if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPrintDialogData, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = (ptr != 0); + } + } + if (_v) { + return _wrap_new_PrintDialogData__SWIG_2(self,args); + } + } PyErr_SetString(PyExc_NotImplementedError,"No matching function for overloaded 'new_PrintDialogData'"); return NULL; @@ -28020,6 +28158,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"PageSetupDialogData_SetPaperId", (PyCFunction) _wrap_PageSetupDialogData_SetPaperId, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PageSetupDialogData_SetPaperSize", (PyCFunction) _wrap_PageSetupDialogData_SetPaperSize, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PageSetupDialogData_SetPrintData", (PyCFunction) _wrap_PageSetupDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PageSetupDialogData_CalculateIdFromPaperSize", (PyCFunction) _wrap_PageSetupDialogData_CalculateIdFromPaperSize, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"PageSetupDialogData_CalculatePaperSizeFromId", (PyCFunction) _wrap_PageSetupDialogData_CalculatePaperSizeFromId, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PageSetupDialogData_swigregister", PageSetupDialogData_swigregister, METH_VARARGS, NULL}, { (char *)"new_PageSetupDialog", (PyCFunction) _wrap_new_PageSetupDialog, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"PageSetupDialog_GetPageSetupData", (PyCFunction) _wrap_PageSetupDialog_GetPageSetupData, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/grid.py b/wxPython/src/gtk/grid.py index 2bad3dc340..d4f9670e86 100644 --- a/wxPython/src/gtk/grid.py +++ b/wxPython/src/gtk/grid.py @@ -115,7 +115,6 @@ class GridCellRendererPtr(GridCellRenderer): self.__class__ = GridCellRenderer _grid.GridCellRenderer_swigregister(GridCellRendererPtr) cvar = _grid.cvar -DateTimeFormatStr = cvar.DateTimeFormatStr GridNoCellCoords = cvar.GridNoCellCoords GridNoCellRect = cvar.GridNoCellRect @@ -248,7 +247,7 @@ class GridCellDateTimeRenderer(GridCellStringRenderer): def __repr__(self): return "<%s.%s; proxy of C++ wxGridCellDateTimeRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(self, String outformat=DateTimeFormatStr, String informat=DateTimeFormatStr) -> GridCellDateTimeRenderer""" + """__init__(self, String outformat=wxPyDefaultDateTimeFormat, String informat=wxPyDefaultDateTimeFormat) -> GridCellDateTimeRenderer""" newobj = _grid.new_GridCellDateTimeRenderer(*args, **kwargs) self.this = newobj.this self.thisown = 1 diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp index a4763d3453..aeb09f206f 100644 --- a/wxPython/src/gtk/grid_wrap.cpp +++ b/wxPython/src/gtk/grid_wrap.cpp @@ -1422,7 +1422,7 @@ static swig_type_info *swig_types[63]; static const wxString wxPyEmptyString(wxEmptyString); static const wxString wxPyPanelNameStr(wxPanelNameStr); - static const wxString wxPyDateTimeFormatStr(wxT("%c")); + static const wxString wxPyDefaultDateTimeFormat(wxDefaultDateTimeFormat); #define wxPyMake_TEMPLATE(TYPE) \ @@ -2637,26 +2637,6 @@ static wxGridCellCoords wxGrid_XYToCell(wxGrid *self,int x,int y){ #ifdef __cplusplus extern "C" { #endif -static int _wrap_DateTimeFormatStr_set(PyObject *) { - PyErr_SetString(PyExc_TypeError,"Variable DateTimeFormatStr is read-only."); - return 1; -} - - -static PyObject *_wrap_DateTimeFormatStr_get(void) { - PyObject *pyobj; - - { -#if wxUSE_UNICODE - pyobj = PyUnicode_FromWideChar((&wxPyDateTimeFormatStr)->c_str(), (&wxPyDateTimeFormatStr)->Len()); -#else - pyobj = PyString_FromStringAndSize((&wxPyDateTimeFormatStr)->c_str(), (&wxPyDateTimeFormatStr)->Len()); -#endif - } - return pyobj; -} - - static int _wrap_GridNoCellCoords_set(PyObject *) { PyErr_SetString(PyExc_TypeError,"Variable GridNoCellCoords is read-only."); return 1; @@ -3344,8 +3324,8 @@ static PyObject * GridCellBoolRenderer_swigregister(PyObject *, PyObject *args) } static PyObject *_wrap_new_GridCellDateTimeRenderer(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxString arg1 = (wxString) wxPyDateTimeFormatStr ; - wxString arg2 = (wxString) wxPyDateTimeFormatStr ; + wxString arg1 = (wxString) wxPyDefaultDateTimeFormat ; + wxString arg2 = (wxString) wxPyDefaultDateTimeFormat ; wxGridCellDateTimeRenderer *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -19901,8 +19881,6 @@ SWIGEXPORT(void) SWIG_init(void) { } SWIG_InstallConstants(d,swig_const_table); - PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); - SWIG_addvarlink(SWIG_globals,(char*)"DateTimeFormatStr",_wrap_DateTimeFormatStr_get, _wrap_DateTimeFormatStr_set); PyDict_SetItemString(d,"GRID_VALUE_STRING", SWIG_FromCharPtr("string")); PyDict_SetItemString(d,"GRID_VALUE_BOOL", SWIG_FromCharPtr("bool")); PyDict_SetItemString(d,"GRID_VALUE_NUMBER", SWIG_FromCharPtr("long")); @@ -19912,6 +19890,7 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"GRID_VALUE_LONG", SWIG_FromCharPtr("long")); PyDict_SetItemString(d,"GRID_VALUE_CHOICEINT", SWIG_FromCharPtr("choiceint")); PyDict_SetItemString(d,"GRID_VALUE_DATETIME", SWIG_FromCharPtr("datetime")); + PyDict_SetItemString(d,(char*)"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellCoords",_wrap_GridNoCellCoords_get, _wrap_GridNoCellCoords_set); SWIG_addvarlink(SWIG_globals,(char*)"GridNoCellRect",_wrap_GridNoCellRect_get, _wrap_GridNoCellRect_set); { -- 2.47.2