From: Robin Dunn Date: Fri, 20 Feb 2004 01:27:16 +0000 (+0000) Subject: reSWIGged X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e498079eb4bc94514b45b5b36fbdc7f8352c6c68?ds=sidebyside reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/_gdi_rename.i b/wxPython/src/_gdi_rename.i index 39ae956b4b..ce81ce4210 100644 --- a/wxPython/src/_gdi_rename.i +++ b/wxPython/src/_gdi_rename.i @@ -403,9 +403,6 @@ %rename(EncodingConverter) wxEncodingConverter; %rename(DC) wxDC; %rename(MemoryDC) wxMemoryDC; -%rename(BUFFER_DC_OVERWRITE_BG) wxBUFFER_DC_OVERWRITE_BG; -%rename(BUFFER_DC_PRESERVE_BG) wxBUFFER_DC_PRESERVE_BG; -%rename(BUFFER_DC_DEFAULT) wxBUFFER_DC_DEFAULT; %rename(BufferedDC) wxBufferedDC; %rename(BufferedPaintDC) wxBufferedPaintDC; %rename(ScreenDC) wxScreenDC; diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py index baafe6a297..b8d1b85734 100644 --- a/wxPython/src/gtk/gdi.py +++ b/wxPython/src/gtk/gdi.py @@ -2818,16 +2818,13 @@ def MemoryDCFromDC(*args, **kwargs): #--------------------------------------------------------------------------- -BUFFER_DC_OVERWRITE_BG = _gdi.BUFFER_DC_OVERWRITE_BG -BUFFER_DC_PRESERVE_BG = _gdi.BUFFER_DC_PRESERVE_BG -BUFFER_DC_DEFAULT = _gdi.BUFFER_DC_DEFAULT class BufferedDC(MemoryDC): def __repr__(self): return "<%s.%s; proxy of C++ wxBufferedDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args): """ __init__(DC dc, Bitmap buffer) -> BufferedDC - __init__(DC dc, Size area, int flags=BUFFER_DC_DEFAULT) -> BufferedDC + __init__(DC dc, Size area) -> BufferedDC """ newobj = _gdi.new_BufferedDC(*args) self.this = newobj.this @@ -2835,6 +2832,12 @@ class BufferedDC(MemoryDC): del newobj.thisown self._dc = args[0] # save a ref so the other dc will not be deleted before self + def __del__(self, destroy=_gdi.delete_BufferedDC): + """__del__()""" + try: + if self.thisown: destroy(self) + except: pass + def UnMask(*args, **kwargs): """UnMask()""" return _gdi.BufferedDC_UnMask(*args, **kwargs) @@ -2848,7 +2851,7 @@ class BufferedDCPtr(BufferedDC): _gdi.BufferedDC_swigregister(BufferedDCPtr) def BufferedDCInternalBuffer(*args): - """BufferedDCInternalBuffer(DC dc, Size area, int flags=BUFFER_DC_DEFAULT) -> BufferedDC""" + """BufferedDCInternalBuffer(DC dc, Size area) -> BufferedDC""" val = _gdi.new_BufferedDCInternalBuffer(*args) val.thisown = 1 val._dc = args[0] # save a ref so the other dc will not be deleted before self @@ -2857,12 +2860,9 @@ def BufferedDCInternalBuffer(*args): class BufferedPaintDC(BufferedDC): def __repr__(self): return "<%s.%s; proxy of C++ wxBufferedPaintDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args): - """ - __init__(Window window, Bitmap buffer) -> BufferedPaintDC - __init__(Window window, int flags=BUFFER_DC_DEFAULT) -> BufferedPaintDC - """ - newobj = _gdi.new_BufferedPaintDC(*args) + def __init__(self, *args, **kwargs): + """__init__(Window window, Bitmap buffer=NullBitmap) -> BufferedPaintDC""" + newobj = _gdi.new_BufferedPaintDC(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown diff --git a/wxPython/src/gtk/gdi_wrap.cpp b/wxPython/src/gtk/gdi_wrap.cpp index 304aa102bb..9889a393c8 100644 --- a/wxPython/src/gtk/gdi_wrap.cpp +++ b/wxPython/src/gtk/gdi_wrap.cpp @@ -14651,28 +14651,20 @@ static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxSize *arg2 = 0 ; - int arg3 = (int) wxBUFFER_DC_DEFAULT ; wxBufferedDC *result; wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDC",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDC",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } - if (obj2) { - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3); + result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -14686,11 +14678,11 @@ static PyObject *_wrap_new_BufferedDC__SWIG_1(PyObject *self, PyObject *args) { static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { int argc; - PyObject *argv[4]; + PyObject *argv[3]; int ii; argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 3); ii++) { + for (ii = 0; (ii < argc) && (ii < 2); ii++) { argv[ii] = PyTuple_GetItem(args,ii); } if (argc == 2) { @@ -14719,7 +14711,7 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { } } } - if ((argc >= 2) && (argc <= 3)) { + if (argc == 2) { int _v; { void *ptr; @@ -14735,21 +14727,7 @@ static PyObject *_wrap_new_BufferedDC(PyObject *self, PyObject *args) { _v = wxPySimple_typecheck(argv[1], wxT("wxSize"), 2); } if (_v) { - if (argc <= 2) { - return _wrap_new_BufferedDC__SWIG_1(self,args); - } - { - SWIG_PyObj_AsInt(argv[2]); - if (PyErr_Occurred()) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - return _wrap_new_BufferedDC__SWIG_1(self,args); - } + return _wrap_new_BufferedDC__SWIG_1(self,args); } } } @@ -14763,28 +14741,20 @@ static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *ar PyObject *resultobj; wxDC *arg1 = (wxDC *) 0 ; wxSize *arg2 = 0 ; - int arg3 = (int) wxBUFFER_DC_DEFAULT ; wxBufferedDC *result; wxSize temp2 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; - PyObject * obj2 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OO|O:new_BufferedDCInternalBuffer",&obj0,&obj1,&obj2)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedDCInternalBuffer",&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { arg2 = &temp2; if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail; } - if (obj2) { - { - arg3 = (int) SWIG_PyObj_AsInt(obj2); - if (PyErr_Occurred()) SWIG_fail; - } - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2,arg3); + result = (wxBufferedDC *)new wxBufferedDC(arg1,(wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -14796,7 +14766,7 @@ static PyObject *_wrap_new_BufferedDCInternalBuffer(PyObject *self, PyObject *ar } -static PyObject *_wrap_BufferedDC_UnMask(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_delete_BufferedDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxBufferedDC *arg1 = (wxBufferedDC *) 0 ; PyObject * obj0 = 0 ; @@ -14804,11 +14774,11 @@ static PyObject *_wrap_BufferedDC_UnMask(PyObject *self, PyObject *args, PyObjec (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BufferedDC_UnMask",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_BufferedDC",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBufferedDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - (arg1)->UnMask(); + delete arg1; wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -14820,60 +14790,60 @@ static PyObject *_wrap_BufferedDC_UnMask(PyObject *self, PyObject *args, PyObjec } -static PyObject * BufferedDC_swigregister(PyObject *self, PyObject *args) { - PyObject *obj; - if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; - SWIG_TypeClientData(SWIGTYPE_p_wxBufferedDC, obj); - Py_INCREF(obj); - return Py_BuildValue((char *)""); -} -static PyObject *_wrap_new_BufferedPaintDC__SWIG_0(PyObject *self, PyObject *args) { +static PyObject *_wrap_BufferedDC_UnMask(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; - wxWindow *arg1 = (wxWindow *) 0 ; - wxBitmap *arg2 = 0 ; - wxBufferedPaintDC *result; + wxBufferedDC *arg1 = (wxBufferedDC *) 0 ; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"OO:new_BufferedPaintDC",&obj0,&obj1)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BufferedDC_UnMask",kwnames,&obj0)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxBufferedDC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2); + (arg1)->UnMask(); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxBufferedPaintDC, 1); + Py_INCREF(Py_None); resultobj = Py_None; return resultobj; fail: return NULL; } -static PyObject *_wrap_new_BufferedPaintDC__SWIG_1(PyObject *self, PyObject *args) { +static PyObject * BufferedDC_swigregister(PyObject *self, PyObject *args) { + PyObject *obj; + if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; + SWIG_TypeClientData(SWIGTYPE_p_wxBufferedDC, obj); + Py_INCREF(obj); + return Py_BuildValue((char *)""); +} +static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - int arg2 = (int) wxBUFFER_DC_DEFAULT ; + wxBitmap const &arg2_defvalue = wxNullBitmap ; + wxBitmap *arg2 = (wxBitmap *) &arg2_defvalue ; wxBufferedPaintDC *result; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "window",(char *) "buffer", NULL + }; - if(!PyArg_ParseTuple(args,(char *)"O|O:new_BufferedPaintDC",&obj0,&obj1)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:new_BufferedPaintDC",kwnames,&obj0,&obj1)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if (obj1) { - { - arg2 = (int) SWIG_PyObj_AsInt(obj1); - if (PyErr_Occurred()) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxBitmap,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,arg2); + result = (wxBufferedPaintDC *)new wxBufferedPaintDC(arg1,(wxBitmap const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -14885,76 +14855,6 @@ static PyObject *_wrap_new_BufferedPaintDC__SWIG_1(PyObject *self, PyObject *arg } -static PyObject *_wrap_new_BufferedPaintDC(PyObject *self, PyObject *args) { - int argc; - PyObject *argv[3]; - int ii; - - argc = PyObject_Length(args); - for (ii = 0; (ii < argc) && (ii < 2); ii++) { - argv[ii] = PyTuple_GetItem(args,ii); - } - if ((argc >= 1) && (argc <= 2)) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - if (argc <= 1) { - return _wrap_new_BufferedPaintDC__SWIG_1(self,args); - } - { - SWIG_PyObj_AsInt(argv[1]); - if (PyErr_Occurred()) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - return _wrap_new_BufferedPaintDC__SWIG_1(self,args); - } - } - } - if (argc == 2) { - int _v; - { - void *ptr; - if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - { - void *ptr; - if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxBitmap, 0) == -1) { - _v = 0; - PyErr_Clear(); - } else { - _v = 1; - } - } - if (_v) { - return _wrap_new_BufferedPaintDC__SWIG_0(self,args); - } - } - } - - PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_BufferedPaintDC'"); - return NULL; -} - - static PyObject * BufferedPaintDC_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -18158,9 +18058,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"MemoryDC_swigregister", MemoryDC_swigregister, METH_VARARGS }, { (char *)"new_BufferedDC", _wrap_new_BufferedDC, METH_VARARGS }, { (char *)"new_BufferedDCInternalBuffer", _wrap_new_BufferedDCInternalBuffer, METH_VARARGS }, + { (char *)"delete_BufferedDC", (PyCFunction) _wrap_delete_BufferedDC, METH_VARARGS | METH_KEYWORDS }, { (char *)"BufferedDC_UnMask", (PyCFunction) _wrap_BufferedDC_UnMask, METH_VARARGS | METH_KEYWORDS }, { (char *)"BufferedDC_swigregister", BufferedDC_swigregister, METH_VARARGS }, - { (char *)"new_BufferedPaintDC", _wrap_new_BufferedPaintDC, METH_VARARGS }, + { (char *)"new_BufferedPaintDC", (PyCFunction) _wrap_new_BufferedPaintDC, METH_VARARGS | METH_KEYWORDS }, { (char *)"BufferedPaintDC_swigregister", BufferedPaintDC_swigregister, METH_VARARGS }, { (char *)"new_ScreenDC", (PyCFunction) _wrap_new_ScreenDC, METH_VARARGS | METH_KEYWORDS }, { (char *)"ScreenDC_StartDrawingOnTopWin", (PyCFunction) _wrap_ScreenDC_StartDrawingOnTopWin, METH_VARARGS | METH_KEYWORDS }, @@ -19163,9 +19064,6 @@ SWIGEXPORT(void) SWIG_init(void) { PyDict_SetItemString(d,"PLATFORM_WINDOWS", SWIG_PyObj_FromInt((int)wxPLATFORM_WINDOWS)); PyDict_SetItemString(d,"PLATFORM_OS2", SWIG_PyObj_FromInt((int)wxPLATFORM_OS2)); PyDict_SetItemString(d,"PLATFORM_MAC", SWIG_PyObj_FromInt((int)wxPLATFORM_MAC)); - PyDict_SetItemString(d,"BUFFER_DC_OVERWRITE_BG", SWIG_PyObj_FromInt((int)wxBUFFER_DC_OVERWRITE_BG)); - PyDict_SetItemString(d,"BUFFER_DC_PRESERVE_BG", SWIG_PyObj_FromInt((int)wxBUFFER_DC_PRESERVE_BG)); - PyDict_SetItemString(d,"BUFFER_DC_DEFAULT", SWIG_PyObj_FromInt((int)wxBUFFER_DC_DEFAULT)); PyDict_SetItemString(d,"IMAGELIST_DRAW_NORMAL", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_NORMAL)); PyDict_SetItemString(d,"IMAGELIST_DRAW_TRANSPARENT", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_TRANSPARENT)); PyDict_SetItemString(d,"IMAGELIST_DRAW_SELECTED", SWIG_PyObj_FromInt((int)wxIMAGELIST_DRAW_SELECTED)); diff --git a/wxPython/src/gtk/windows.py b/wxPython/src/gtk/windows.py index b314d70f7d..062f38b959 100644 --- a/wxPython/src/gtk/windows.py +++ b/wxPython/src/gtk/windows.py @@ -1993,13 +1993,16 @@ _windows.FileDialog_swigregister(FileDialogPtr) CHOICEDLG_STYLE = _windows.CHOICEDLG_STYLE class MultiChoiceDialog(Dialog): + """A simple dialog with a multi selection listbox.""" def __repr__(self): return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, String message, String caption, int choices=0, - String choices_array, long style=CHOICEDLG_STYLE, + __init__(Window parent, String message, String caption, + List choices=[], long style=CHOICEDLG_STYLE, Point pos=DefaultPosition) -> MultiChoiceDialog + + Constructor. Use ShowModal method to show the dialog. """ newobj = _windows.new_MultiChoiceDialog(*args, **kwargs) self.this = newobj.this @@ -2008,11 +2011,19 @@ class MultiChoiceDialog(Dialog): self._setOORInfo(self) def SetSelections(*args, **kwargs): - """SetSelections(wxArrayInt selections)""" + """ + SetSelections(List selections) + + Specify the items in the list that shoudl be selected, using a list of integers. + """ return _windows.MultiChoiceDialog_SetSelections(*args, **kwargs) def GetSelections(*args, **kwargs): - """GetSelections() -> PyObject""" + """ + GetSelections() -> [selections] + + Returns a list of integers representing the items that are selected. + """ return _windows.MultiChoiceDialog_GetSelections(*args, **kwargs) @@ -2024,13 +2035,16 @@ class MultiChoiceDialogPtr(MultiChoiceDialog): _windows.MultiChoiceDialog_swigregister(MultiChoiceDialogPtr) class SingleChoiceDialog(Dialog): + """A simple dialog with a single selection listbox.""" def __repr__(self): return "<%s.%s; proxy of C++ wxSingleChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ - __init__(Window parent, String message, String caption, int choices, - String choices_array, long style=CHOICEDLG_STYLE, + __init__(Window parent, String message, String caption, + List choices=[], long style=CHOICEDLG_STYLE, Point pos=DefaultPosition) -> SingleChoiceDialog + + Constructor. Use ShowModal method to show the dialog. """ newobj = _windows.new_SingleChoiceDialog(*args, **kwargs) self.this = newobj.this @@ -2039,20 +2053,28 @@ class SingleChoiceDialog(Dialog): self._setOORInfo(self) def GetSelection(*args, **kwargs): - """GetSelection() -> int""" + """ + GetSelection() -> int + + Get the index of teh currently selected item. + """ return _windows.SingleChoiceDialog_GetSelection(*args, **kwargs) def GetStringSelection(*args, **kwargs): - """GetStringSelection() -> String""" + """ + GetStringSelection() -> String + + Returns the string value of the currently selected item + """ return _windows.SingleChoiceDialog_GetStringSelection(*args, **kwargs) def SetSelection(*args, **kwargs): - """SetSelection(int sel)""" - return _windows.SingleChoiceDialog_SetSelection(*args, **kwargs) + """ + SetSelection(int sel) - def ShowModal(*args, **kwargs): - """ShowModal() -> int""" - return _windows.SingleChoiceDialog_ShowModal(*args, **kwargs) + Set the current selected item to sel + """ + return _windows.SingleChoiceDialog_SetSelection(*args, **kwargs) class SingleChoiceDialogPtr(SingleChoiceDialog): @@ -2063,6 +2085,7 @@ class SingleChoiceDialogPtr(SingleChoiceDialog): _windows.SingleChoiceDialog_swigregister(SingleChoiceDialogPtr) class TextEntryDialog(Dialog): + """A dialog with text control, [ok] and [cancel] buttons""" def __repr__(self): return "<%s.%s; proxy of C++ wxTextEntryDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2070,6 +2093,8 @@ class TextEntryDialog(Dialog): __init__(Window parent, String message, String caption=GetTextFromUserPromptStr, String defaultValue=EmptyString, long style=wxOK|wxCANCEL|wxCENTRE, Point pos=DefaultPosition) -> TextEntryDialog + + Constructor. Use ShowModal method to show the dialog. """ newobj = _windows.new_TextEntryDialog(*args, **kwargs) self.this = newobj.this @@ -2078,16 +2103,21 @@ class TextEntryDialog(Dialog): self._setOORInfo(self) def GetValue(*args, **kwargs): - """GetValue() -> String""" + """ + GetValue() -> String + + Returns the text that the user has entered if the user has pressed OK, + or the original value if the user has pressed Cancel. + """ return _windows.TextEntryDialog_GetValue(*args, **kwargs) def SetValue(*args, **kwargs): - """SetValue(String value)""" - return _windows.TextEntryDialog_SetValue(*args, **kwargs) + """ + SetValue(String value) - def ShowModal(*args, **kwargs): - """ShowModal() -> int""" - return _windows.TextEntryDialog_ShowModal(*args, **kwargs) + Sets the default text value. + """ + return _windows.TextEntryDialog_SetValue(*args, **kwargs) class TextEntryDialogPtr(TextEntryDialog): @@ -2098,10 +2128,15 @@ class TextEntryDialogPtr(TextEntryDialog): _windows.TextEntryDialog_swigregister(TextEntryDialogPtr) class FontData(core.Object): + """This class holds a variety of information related to font dialogs.""" def __repr__(self): return "<%s.%s; proxy of C++ wxFontData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__() -> FontData""" + """ + __init__() -> FontData + + This class holds a variety of information related to font dialogs. + """ newobj = _windows.new_FontData(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -2113,55 +2148,116 @@ class FontData(core.Object): except: pass def EnableEffects(*args, **kwargs): - """EnableEffects(bool enable)""" + """ + EnableEffects(bool enable) + + Enables or disables 'effects' under MS Windows only. This refers + to the controls for manipulating colour, strikeout and underline + properties. The default value is true. + """ return _windows.FontData_EnableEffects(*args, **kwargs) def GetAllowSymbols(*args, **kwargs): - """GetAllowSymbols() -> bool""" + """ + GetAllowSymbols() -> bool + + Under MS Windows, returns a flag determining whether symbol fonts can be + selected. Has no effect on other platforms. The default value is true. + """ return _windows.FontData_GetAllowSymbols(*args, **kwargs) def GetColour(*args, **kwargs): - """GetColour() -> Colour""" + """ + GetColour() -> Colour + + Gets the colour associated with the font dialog. The default value is black. + """ return _windows.FontData_GetColour(*args, **kwargs) def GetChosenFont(*args, **kwargs): - """GetChosenFont() -> Font""" + """ + GetChosenFont() -> Font + + Gets the font chosen by the user. + """ return _windows.FontData_GetChosenFont(*args, **kwargs) def GetEnableEffects(*args, **kwargs): - """GetEnableEffects() -> bool""" + """ + GetEnableEffects() -> bool + + Determines whether 'effects' are enabled under Windows. + """ return _windows.FontData_GetEnableEffects(*args, **kwargs) def GetInitialFont(*args, **kwargs): - """GetInitialFont() -> Font""" + """ + GetInitialFont() -> Font + + Gets the font that will be initially used by the font dialog. This should have + previously been set by the application. + """ return _windows.FontData_GetInitialFont(*args, **kwargs) def GetShowHelp(*args, **kwargs): - """GetShowHelp() -> bool""" + """ + GetShowHelp() -> bool + + Returns true if the Help button will be shown (Windows only). The default + value is false. + """ return _windows.FontData_GetShowHelp(*args, **kwargs) def SetAllowSymbols(*args, **kwargs): - """SetAllowSymbols(bool allowSymbols)""" + """ + SetAllowSymbols(bool allowSymbols) + + Under MS Windows, determines whether symbol fonts can be selected. Has no + effect on other platforms. The default value is true. + """ return _windows.FontData_SetAllowSymbols(*args, **kwargs) def SetChosenFont(*args, **kwargs): - """SetChosenFont(Font font)""" + """ + SetChosenFont(Font font) + + Sets the font that will be returned to the user (for internal use only). + """ return _windows.FontData_SetChosenFont(*args, **kwargs) def SetColour(*args, **kwargs): - """SetColour(Colour colour)""" + """ + SetColour(Colour colour) + + Sets the colour that will be used for the font foreground colour. The default + colour is black. + """ return _windows.FontData_SetColour(*args, **kwargs) def SetInitialFont(*args, **kwargs): - """SetInitialFont(Font font)""" + """ + SetInitialFont(Font font) + + Sets the font that will be initially used by the font dialog. + """ return _windows.FontData_SetInitialFont(*args, **kwargs) def SetRange(*args, **kwargs): - """SetRange(int min, int max)""" + """ + SetRange(int min, int max) + + Sets the valid range for the font point size (Windows only). The default is + 0, 0 (unrestricted range). + """ return _windows.FontData_SetRange(*args, **kwargs) def SetShowHelp(*args, **kwargs): - """SetShowHelp(bool showHelp)""" + """ + SetShowHelp(bool showHelp) + + Determines whether the Help button will be displayed in the font dialog + (Windows only). The default value is false. + """ return _windows.FontData_SetShowHelp(*args, **kwargs) @@ -2173,23 +2269,30 @@ class FontDataPtr(FontData): _windows.FontData_swigregister(FontDataPtr) class FontDialog(Dialog): + """This class represents the font chooser dialog.""" def __repr__(self): return "<%s.%s; proxy of C++ wxFontDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) - def __init__(self, *args, **kwargs): - """__init__(Window parent, FontData data) -> FontDialog""" - newobj = _windows.new_FontDialog(*args, **kwargs) + def __init__(self, *args): + """ + __init__(Window parent) -> FontDialog + __init__(Window parent, FontData data) -> FontDialog + + Constructor. Pass a parent window, and optionally the font data object to be + used to initialize the dialog controls. + """ + newobj = _windows.new_FontDialog(*args) self.this = newobj.this self.thisown = 1 del newobj.thisown self._setOORInfo(self) def GetFontData(*args, **kwargs): - """GetFontData() -> FontData""" - return _windows.FontDialog_GetFontData(*args, **kwargs) + """ + GetFontData() -> FontData - def ShowModal(*args, **kwargs): - """ShowModal() -> int""" - return _windows.FontDialog_ShowModal(*args, **kwargs) + Returns a reference to the internal FontData used by the FontDialog. + """ + return _windows.FontDialog_GetFontData(*args, **kwargs) class FontDialogPtr(FontDialog): @@ -2200,6 +2303,10 @@ class FontDialogPtr(FontDialog): _windows.FontDialog_swigregister(FontDialogPtr) class MessageDialog(Dialog): + """ + This class provides a dialog that shows a single or multi-line message, with + a choice of OK, Yes, No and Cancel buttons. + """ def __repr__(self): return "<%s.%s; proxy of C++ wxMessageDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): @@ -2207,6 +2314,9 @@ class MessageDialog(Dialog): __init__(Window parent, String message, String caption=MessageBoxCaptionStr, long style=wxOK|wxCANCEL|wxCENTRE, Point pos=DefaultPosition) -> MessageDialog + + This class provides a dialog that shows a single or multi-line message, with + a choice of OK, Yes, No and Cancel buttons. """ newobj = _windows.new_MessageDialog(*args, **kwargs) self.this = newobj.this @@ -2214,10 +2324,6 @@ class MessageDialog(Dialog): del newobj.thisown self._setOORInfo(self) - def ShowModal(*args, **kwargs): - """ShowModal() -> int""" - return _windows.MessageDialog_ShowModal(*args, **kwargs) - class MessageDialogPtr(MessageDialog): def __init__(self, this): @@ -2227,12 +2333,19 @@ class MessageDialogPtr(MessageDialog): _windows.MessageDialog_swigregister(MessageDialogPtr) class ProgressDialog(Frame): + """ + A dialog that shows a short message and a progress bar. Optionally, it can + display an ABORT button. + """ def __repr__(self): return "<%s.%s; proxy of C++ wxProgressDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ __init__(String title, String message, int maximum=100, Window parent=None, int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -> ProgressDialog + + Constructor. Creates the dialog, displays it and disables user input for other + windows, or, if wxPD_APP_MODAL flag is not given, for its parent window only. """ newobj = _windows.new_ProgressDialog(*args, **kwargs) self.this = newobj.this @@ -2241,11 +2354,25 @@ class ProgressDialog(Frame): self._setOORInfo(self) def Update(*args, **kwargs): - """Update(int value, String newmsg=EmptyString) -> bool""" + """ + Update(int value, String newmsg=EmptyString) -> bool + + Updates the dialog, setting the progress bar to the new value and, if given + changes the message above it. Returns true unless the Cancel button has been + pressed. + + If false is returned, the application can either immediately destroy the + dialog or ask the user for the confirmation and if the abort is not confirmed + the dialog may be resumed with Resume function. + """ return _windows.ProgressDialog_Update(*args, **kwargs) def Resume(*args, **kwargs): - """Resume()""" + """ + Resume() + + Can be used to continue with the dialog, after the user had chosen to abort. + """ return _windows.ProgressDialog_Resume(*args, **kwargs) @@ -2282,28 +2409,51 @@ EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL EVT_COMMAND_FIND_CLOSE = EVT_FIND_CLOSE class FindDialogEvent(core.CommandEvent): + """Events for the FindReplaceDialog""" def __repr__(self): return "<%s.%s; proxy of C++ wxFindDialogEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(wxEventType commandType=wxEVT_NULL, int id=0) -> FindDialogEvent""" + """ + __init__(wxEventType commandType=wxEVT_NULL, int id=0) -> FindDialogEvent + + Events for the FindReplaceDialog + """ newobj = _windows.new_FindDialogEvent(*args, **kwargs) self.this = newobj.this self.thisown = 1 del newobj.thisown def GetFlags(*args, **kwargs): - """GetFlags() -> int""" + """ + GetFlags() -> int + + Get the currently selected flags: this is the combination of + wx.FR_DOWN, wx.FR_WHOLEWORD and wx.FR_MATCHCASE flags. + """ return _windows.FindDialogEvent_GetFlags(*args, **kwargs) def GetFindString(*args, **kwargs): - """GetFindString() -> String""" + """ + GetFindString() -> String + + Return the string to find (never empty). + """ return _windows.FindDialogEvent_GetFindString(*args, **kwargs) def GetReplaceString(*args, **kwargs): - """GetReplaceString() -> String""" + """ + GetReplaceString() -> String + + Return the string to replace the search string with (only + for replace and replace all events). + """ return _windows.FindDialogEvent_GetReplaceString(*args, **kwargs) def GetDialog(*args, **kwargs): - """GetDialog() -> FindReplaceDialog""" + """ + GetDialog() -> FindReplaceDialog + + Return the pointer to the dialog which generated this event. + """ return _windows.FindDialogEvent_GetDialog(*args, **kwargs) def SetFlags(*args, **kwargs): @@ -2327,10 +2477,33 @@ class FindDialogEventPtr(FindDialogEvent): _windows.FindDialogEvent_swigregister(FindDialogEventPtr) class FindReplaceData(core.Object): + """ + FindReplaceData holds the data for FindReplaceDialog. It is used to initialize + the dialog with the default values and will keep the last values from the + dialog when it is closed. It is also updated each time a wxFindDialogEvent is + generated so instead of using the wxFindDialogEvent methods you can also + directly query this object. + + Note that all SetXXX() methods may only be called before showing the dialog + and calling them has no effect later. + + Flags + wxFR_DOWN: downward search/replace selected (otherwise, upwards) + + wxFR_WHOLEWORD: whole word search/replace selected + + wxFR_MATCHCASE: case sensitive search/replace selected (otherwise, + case insensitive) + + """ def __repr__(self): return "<%s.%s; proxy of C++ wxFindReplaceData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): - """__init__(int flags=0) -> FindReplaceData""" + """ + __init__(int flags=0) -> FindReplaceData + + Constuctor initializes the flags to default value (0). + """ newobj = _windows.new_FindReplaceData(*args, **kwargs) self.this = newobj.this self.thisown = 1 @@ -2342,27 +2515,51 @@ class FindReplaceData(core.Object): except: pass def GetFindString(*args, **kwargs): - """GetFindString() -> String""" + """ + GetFindString() -> String + + Get the string to find. + """ return _windows.FindReplaceData_GetFindString(*args, **kwargs) def GetReplaceString(*args, **kwargs): - """GetReplaceString() -> String""" + """ + GetReplaceString() -> String + + Get the replacement string. + """ return _windows.FindReplaceData_GetReplaceString(*args, **kwargs) def GetFlags(*args, **kwargs): - """GetFlags() -> int""" + """ + GetFlags() -> int + + Get the combination of flag values. + """ return _windows.FindReplaceData_GetFlags(*args, **kwargs) def SetFlags(*args, **kwargs): - """SetFlags(int flags)""" + """ + SetFlags(int flags) + + Set the flags to use to initialize the controls of the dialog. + """ return _windows.FindReplaceData_SetFlags(*args, **kwargs) def SetFindString(*args, **kwargs): - """SetFindString(String str)""" + """ + SetFindString(String str) + + Set the string to find (used as initial value by the dialog). + """ return _windows.FindReplaceData_SetFindString(*args, **kwargs) def SetReplaceString(*args, **kwargs): - """SetReplaceString(String str)""" + """ + SetReplaceString(String str) + + Set the replacement string (used as initial value by the dialog). + """ return _windows.FindReplaceData_SetReplaceString(*args, **kwargs) @@ -2374,12 +2571,24 @@ class FindReplaceDataPtr(FindReplaceData): _windows.FindReplaceData_swigregister(FindReplaceDataPtr) class FindReplaceDialog(Dialog): + """ + FindReplaceDialog is a standard modeless dialog which is used to allow the + user to search for some text (and possibly replace it with something + else). The actual searching is supposed to be done in the owner window which + is the parent of this dialog. Note that it means that unlike for the other + standard dialogs this one must have a parent window. Also note that there is + no way to use this dialog in a modal way; it is always, by design and + implementation, modeless. + """ def __repr__(self): return "<%s.%s; proxy of C++ wxFindReplaceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,) def __init__(self, *args, **kwargs): """ __init__(Window parent, FindReplaceData data, String title, int style=0) -> FindReplaceDialog + + Create a FindReplaceDialog. The parent and data parameters must be + non-None. Use Show to display the dialog. """ newobj = _windows.new_FindReplaceDialog(*args, **kwargs) self.this = newobj.this @@ -2391,15 +2600,25 @@ class FindReplaceDialog(Dialog): """ Create(Window parent, FindReplaceData data, String title, int style=0) -> bool + + Create the dialog, for 2-phase create. """ return _windows.FindReplaceDialog_Create(*args, **kwargs) def GetData(*args, **kwargs): - """GetData() -> FindReplaceData""" + """ + GetData() -> FindReplaceData + + Get the FindReplaceData object used by this dialog. + """ return _windows.FindReplaceDialog_GetData(*args, **kwargs) def SetData(*args, **kwargs): - """SetData(FindReplaceData data)""" + """ + SetData(FindReplaceData data) + + Set the FindReplaceData object used by this dialog. + """ return _windows.FindReplaceDialog_SetData(*args, **kwargs) @@ -2411,7 +2630,11 @@ class FindReplaceDialogPtr(FindReplaceDialog): _windows.FindReplaceDialog_swigregister(FindReplaceDialogPtr) def PreFindReplaceDialog(*args, **kwargs): - """PreFindReplaceDialog() -> FindReplaceDialog""" + """ + PreFindReplaceDialog() -> FindReplaceDialog + + Precreate a FindReplaceDialog for 2-phase creation + """ val = _windows.new_PreFindReplaceDialog(*args, **kwargs) val.thisown = 1 return val diff --git a/wxPython/src/gtk/windows_wrap.cpp b/wxPython/src/gtk/windows_wrap.cpp index 053f5eb0c7..8ca0292b62 100644 --- a/wxPython/src/gtk/windows_wrap.cpp +++ b/wxPython/src/gtk/windows_wrap.cpp @@ -12257,31 +12257,6 @@ static PyObject *_wrap_SingleChoiceDialog_SetSelection(PyObject *self, PyObject } -static PyObject *_wrap_SingleChoiceDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxSingleChoiceDialog *arg1 = (wxSingleChoiceDialog *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:SingleChoiceDialog_ShowModal",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSingleChoiceDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowModal(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_PyObj_FromInt((int)result); - return resultobj; - fail: - return NULL; -} - - static PyObject * SingleChoiceDialog_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -12457,31 +12432,6 @@ static PyObject *_wrap_TextEntryDialog_SetValue(PyObject *self, PyObject *args, } -static PyObject *_wrap_TextEntryDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxTextEntryDialog *arg1 = (wxTextEntryDialog *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TextEntryDialog_ShowModal",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxTextEntryDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowModal(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_PyObj_FromInt((int)result); - return resultobj; - fail: - return NULL; -} - - static PyObject * TextEntryDialog_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -12921,26 +12871,17 @@ static PyObject * FontData_swigregister(PyObject *self, PyObject *args) { Py_INCREF(obj); return Py_BuildValue((char *)""); } -static PyObject *_wrap_new_FontDialog(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_FontDialog__SWIG_0(PyObject *self, PyObject *args) { PyObject *resultobj; wxWindow *arg1 = (wxWindow *) 0 ; - wxFontData *arg2 = 0 ; wxFontDialog *result; PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - char *kwnames[] = { - (char *) "parent",(char *) "data", NULL - }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:new_FontDialog",kwnames,&obj0,&obj1)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"O:new_FontDialog",&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - if (arg2 == NULL) { - PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; - } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxFontDialog *)new wxFontDialog(arg1,(wxFontData const &)*arg2); + result = (wxFontDialog *)new wxFontDialog(arg1); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; @@ -12952,53 +12893,112 @@ static PyObject *_wrap_new_FontDialog(PyObject *self, PyObject *args, PyObject * } -static PyObject *_wrap_FontDialog_GetFontData(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_FontDialog__SWIG_1(PyObject *self, PyObject *args) { PyObject *resultobj; - wxFontDialog *arg1 = (wxFontDialog *) 0 ; - wxFontData *result; + wxWindow *arg1 = (wxWindow *) 0 ; + wxFontData *arg2 = 0 ; + wxFontDialog *result; PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; + PyObject * obj1 = 0 ; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontDialog_GetFontData",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if(!PyArg_ParseTuple(args,(char *)"OO:new_FontDialog",&obj0,&obj1)) goto fail; + if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxFontData,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; + if (arg2 == NULL) { + PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail; + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - { - wxFontData &_result_ref = (arg1)->GetFontData(); - result = (wxFontData *) &_result_ref; - } + result = (wxFontDialog *)new wxFontDialog(arg1,(wxFontData const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFontData, 0); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFontDialog, 1); return resultobj; fail: return NULL; } -static PyObject *_wrap_FontDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_new_FontDialog(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[3]; + int ii; + + argc = PyObject_Length(args); + for (ii = 0; (ii < argc) && (ii < 2); ii++) { + argv[ii] = PyTuple_GetItem(args,ii); + } + if (argc == 1) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_FontDialog__SWIG_0(self,args); + } + } + if (argc == 2) { + int _v; + { + void *ptr; + if (SWIG_ConvertPtr(argv[0], (void **) &ptr, SWIGTYPE_p_wxWindow, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + { + void *ptr; + if (SWIG_ConvertPtr(argv[1], (void **) &ptr, SWIGTYPE_p_wxFontData, 0) == -1) { + _v = 0; + PyErr_Clear(); + } else { + _v = 1; + } + } + if (_v) { + return _wrap_new_FontDialog__SWIG_1(self,args); + } + } + } + + PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_FontDialog'"); + return NULL; +} + + +static PyObject *_wrap_FontDialog_GetFontData(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxFontDialog *arg1 = (wxFontDialog *) 0 ; - int result; + wxFontData *result; PyObject * obj0 = 0 ; char *kwnames[] = { (char *) "self", NULL }; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontDialog_ShowModal",kwnames,&obj0)) goto fail; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontDialog_GetFontData",kwnames,&obj0)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxFontDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowModal(); + { + wxFontData &_result_ref = (arg1)->GetFontData(); + result = (wxFontData *) &_result_ref; + } wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } - resultobj = SWIG_PyObj_FromInt((int)result); + resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxFontData, 0); return resultobj; fail: return NULL; @@ -13090,31 +13090,6 @@ static PyObject *_wrap_new_MessageDialog(PyObject *self, PyObject *args, PyObjec } -static PyObject *_wrap_MessageDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject *resultobj; - wxMessageDialog *arg1 = (wxMessageDialog *) 0 ; - int result; - PyObject * obj0 = 0 ; - char *kwnames[] = { - (char *) "self", NULL - }; - - if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MessageDialog_ShowModal",kwnames,&obj0)) goto fail; - if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMessageDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; - { - PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (int)(arg1)->ShowModal(); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) SWIG_fail; - } - resultobj = SWIG_PyObj_FromInt((int)result); - return resultobj; - fail: - return NULL; -} - - static PyObject * MessageDialog_swigregister(PyObject *self, PyObject *args) { PyObject *obj; if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL; @@ -22927,12 +22902,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"SingleChoiceDialog_GetSelection", (PyCFunction) _wrap_SingleChoiceDialog_GetSelection, METH_VARARGS | METH_KEYWORDS }, { (char *)"SingleChoiceDialog_GetStringSelection", (PyCFunction) _wrap_SingleChoiceDialog_GetStringSelection, METH_VARARGS | METH_KEYWORDS }, { (char *)"SingleChoiceDialog_SetSelection", (PyCFunction) _wrap_SingleChoiceDialog_SetSelection, METH_VARARGS | METH_KEYWORDS }, - { (char *)"SingleChoiceDialog_ShowModal", (PyCFunction) _wrap_SingleChoiceDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"SingleChoiceDialog_swigregister", SingleChoiceDialog_swigregister, METH_VARARGS }, { (char *)"new_TextEntryDialog", (PyCFunction) _wrap_new_TextEntryDialog, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextEntryDialog_GetValue", (PyCFunction) _wrap_TextEntryDialog_GetValue, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextEntryDialog_SetValue", (PyCFunction) _wrap_TextEntryDialog_SetValue, METH_VARARGS | METH_KEYWORDS }, - { (char *)"TextEntryDialog_ShowModal", (PyCFunction) _wrap_TextEntryDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"TextEntryDialog_swigregister", TextEntryDialog_swigregister, METH_VARARGS }, { (char *)"new_FontData", (PyCFunction) _wrap_new_FontData, METH_VARARGS | METH_KEYWORDS }, { (char *)"delete_FontData", (PyCFunction) _wrap_delete_FontData, METH_VARARGS | METH_KEYWORDS }, @@ -22950,12 +22923,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"FontData_SetRange", (PyCFunction) _wrap_FontData_SetRange, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontData_SetShowHelp", (PyCFunction) _wrap_FontData_SetShowHelp, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontData_swigregister", FontData_swigregister, METH_VARARGS }, - { (char *)"new_FontDialog", (PyCFunction) _wrap_new_FontDialog, METH_VARARGS | METH_KEYWORDS }, + { (char *)"new_FontDialog", _wrap_new_FontDialog, METH_VARARGS }, { (char *)"FontDialog_GetFontData", (PyCFunction) _wrap_FontDialog_GetFontData, METH_VARARGS | METH_KEYWORDS }, - { (char *)"FontDialog_ShowModal", (PyCFunction) _wrap_FontDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"FontDialog_swigregister", FontDialog_swigregister, METH_VARARGS }, { (char *)"new_MessageDialog", (PyCFunction) _wrap_new_MessageDialog, METH_VARARGS | METH_KEYWORDS }, - { (char *)"MessageDialog_ShowModal", (PyCFunction) _wrap_MessageDialog_ShowModal, METH_VARARGS | METH_KEYWORDS }, { (char *)"MessageDialog_swigregister", MessageDialog_swigregister, METH_VARARGS }, { (char *)"new_ProgressDialog", (PyCFunction) _wrap_new_ProgressDialog, METH_VARARGS | METH_KEYWORDS }, { (char *)"ProgressDialog_Update", (PyCFunction) _wrap_ProgressDialog_Update, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/wxPython/gdi.py b/wxPython/wxPython/gdi.py index b3dafe0b2c..9a469edbc2 100644 --- a/wxPython/wxPython/gdi.py +++ b/wxPython/wxPython/gdi.py @@ -486,9 +486,6 @@ wxDCPtr = wx.gdi.DCPtr wxMemoryDC = wx.gdi.MemoryDC wxMemoryDCPtr = wx.gdi.MemoryDCPtr wxMemoryDCFromDC = wx.gdi.MemoryDCFromDC -wxBUFFER_DC_OVERWRITE_BG = wx.gdi.BUFFER_DC_OVERWRITE_BG -wxBUFFER_DC_PRESERVE_BG = wx.gdi.BUFFER_DC_PRESERVE_BG -wxBUFFER_DC_DEFAULT = wx.gdi.BUFFER_DC_DEFAULT wxBufferedDC = wx.gdi.BufferedDC wxBufferedDCPtr = wx.gdi.BufferedDCPtr wxBufferedDCInternalBuffer = wx.gdi.BufferedDCInternalBuffer