From 034e367709c3c62625191a5dc73c9605ff961e60 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 25 May 2005 02:17:14 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_windows.py | 21 ++++- wxPython/src/mac/_core.py | 55 +++++++++++- wxPython/src/mac/_core_wrap.cpp | 150 ++++++++++++++++++++++++++++++++ wxPython/src/mac/_windows.py | 21 ++++- wxPython/src/mac/media.py | 8 ++ wxPython/src/mac/media_wrap.cpp | 73 +++++++++++++++- wxPython/src/msw/_core.py | 55 +++++++++++- wxPython/src/msw/_core_wrap.cpp | 150 ++++++++++++++++++++++++++++++++ wxPython/src/msw/_windows.py | 21 ++++- wxPython/src/msw/media.py | 8 ++ wxPython/src/msw/media_wrap.cpp | 73 +++++++++++++++- 11 files changed, 615 insertions(+), 20 deletions(-) diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py index 8c882b373e..62afb01983 100644 --- a/wxPython/src/gtk/_windows.py +++ b/wxPython/src/gtk/_windows.py @@ -2648,11 +2648,22 @@ class MultiChoiceDialog(Dialog): 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, - List choices=[], long style=CHOICEDLG_STYLE, + __init__(self, Window parent, String message, String caption, + List choices=None, long style=CHOICEDLG_STYLE, Point pos=DefaultPosition) -> MultiChoiceDialog - Constructor. Use ShowModal method to show the dialog. + Constructor. Use the `ShowModal` method to show the dialog. + + :param parent: The parent window. + :param message: Text to display above the list of selections. + :param caption: Text to use in the title bar of the dialog. + :param choices: A list of strings or unicode objects that the + user is allowed to choose from. + :param style: Styles to apply to the dialog. The default value is + equivallent to wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER|wx.OK|wx.CANCEL|wx.CENTER. + :param pos: Where to position the dialog (not used on Windows) + + """ newobj = _windows_.new_MultiChoiceDialog(*args, **kwargs) self.this = newobj.this @@ -2665,7 +2676,8 @@ class MultiChoiceDialog(Dialog): SetSelections(List selections) Specify the items in the list that should be selected, using a list of - integers. + integers. The list should specify the indexes of the items that + should be selected. """ return _windows_.MultiChoiceDialog_SetSelections(*args, **kwargs) @@ -2674,6 +2686,7 @@ class MultiChoiceDialog(Dialog): GetSelections() -> [selections] Returns a list of integers representing the items that are selected. + If an item is selected then its index will appear in the list. """ return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs) diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 66cd8e452b..fc9b7c387f 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -596,6 +596,56 @@ PAPER_B5_EXTRA = _core_.PAPER_B5_EXTRA PAPER_A2 = _core_.PAPER_A2 PAPER_A3_TRANSVERSE = _core_.PAPER_A3_TRANSVERSE PAPER_A3_EXTRA_TRANSVERSE = _core_.PAPER_A3_EXTRA_TRANSVERSE +PAPER_DBL_JAPANESE_POSTCARD = _core_.PAPER_DBL_JAPANESE_POSTCARD +PAPER_A6 = _core_.PAPER_A6 +PAPER_JENV_KAKU2 = _core_.PAPER_JENV_KAKU2 +PAPER_JENV_KAKU3 = _core_.PAPER_JENV_KAKU3 +PAPER_JENV_CHOU3 = _core_.PAPER_JENV_CHOU3 +PAPER_JENV_CHOU4 = _core_.PAPER_JENV_CHOU4 +PAPER_LETTER_ROTATED = _core_.PAPER_LETTER_ROTATED +PAPER_A3_ROTATED = _core_.PAPER_A3_ROTATED +PAPER_A4_ROTATED = _core_.PAPER_A4_ROTATED +PAPER_A5_ROTATED = _core_.PAPER_A5_ROTATED +PAPER_B4_JIS_ROTATED = _core_.PAPER_B4_JIS_ROTATED +PAPER_B5_JIS_ROTATED = _core_.PAPER_B5_JIS_ROTATED +PAPER_JAPANESE_POSTCARD_ROTATED = _core_.PAPER_JAPANESE_POSTCARD_ROTATED +PAPER_DBL_JAPANESE_POSTCARD_ROTATED = _core_.PAPER_DBL_JAPANESE_POSTCARD_ROTATED +PAPER_A6_ROTATED = _core_.PAPER_A6_ROTATED +PAPER_JENV_KAKU2_ROTATED = _core_.PAPER_JENV_KAKU2_ROTATED +PAPER_JENV_KAKU3_ROTATED = _core_.PAPER_JENV_KAKU3_ROTATED +PAPER_JENV_CHOU3_ROTATED = _core_.PAPER_JENV_CHOU3_ROTATED +PAPER_JENV_CHOU4_ROTATED = _core_.PAPER_JENV_CHOU4_ROTATED +PAPER_B6_JIS = _core_.PAPER_B6_JIS +PAPER_B6_JIS_ROTATED = _core_.PAPER_B6_JIS_ROTATED +PAPER_12X11 = _core_.PAPER_12X11 +PAPER_JENV_YOU4 = _core_.PAPER_JENV_YOU4 +PAPER_JENV_YOU4_ROTATED = _core_.PAPER_JENV_YOU4_ROTATED +PAPER_P16K = _core_.PAPER_P16K +PAPER_P32K = _core_.PAPER_P32K +PAPER_P32KBIG = _core_.PAPER_P32KBIG +PAPER_PENV_1 = _core_.PAPER_PENV_1 +PAPER_PENV_2 = _core_.PAPER_PENV_2 +PAPER_PENV_3 = _core_.PAPER_PENV_3 +PAPER_PENV_4 = _core_.PAPER_PENV_4 +PAPER_PENV_5 = _core_.PAPER_PENV_5 +PAPER_PENV_6 = _core_.PAPER_PENV_6 +PAPER_PENV_7 = _core_.PAPER_PENV_7 +PAPER_PENV_8 = _core_.PAPER_PENV_8 +PAPER_PENV_9 = _core_.PAPER_PENV_9 +PAPER_PENV_10 = _core_.PAPER_PENV_10 +PAPER_P16K_ROTATED = _core_.PAPER_P16K_ROTATED +PAPER_P32K_ROTATED = _core_.PAPER_P32K_ROTATED +PAPER_P32KBIG_ROTATED = _core_.PAPER_P32KBIG_ROTATED +PAPER_PENV_1_ROTATED = _core_.PAPER_PENV_1_ROTATED +PAPER_PENV_2_ROTATED = _core_.PAPER_PENV_2_ROTATED +PAPER_PENV_3_ROTATED = _core_.PAPER_PENV_3_ROTATED +PAPER_PENV_4_ROTATED = _core_.PAPER_PENV_4_ROTATED +PAPER_PENV_5_ROTATED = _core_.PAPER_PENV_5_ROTATED +PAPER_PENV_6_ROTATED = _core_.PAPER_PENV_6_ROTATED +PAPER_PENV_7_ROTATED = _core_.PAPER_PENV_7_ROTATED +PAPER_PENV_8_ROTATED = _core_.PAPER_PENV_8_ROTATED +PAPER_PENV_9_ROTATED = _core_.PAPER_PENV_9_ROTATED +PAPER_PENV_10_ROTATED = _core_.PAPER_PENV_10_ROTATED DUPLEX_SIMPLEX = _core_.DUPLEX_SIMPLEX DUPLEX_HORIZONTAL = _core_.DUPLEX_HORIZONTAL DUPLEX_VERTICAL = _core_.DUPLEX_VERTICAL @@ -5485,7 +5535,10 @@ class CloseEvent(Event): """ GetLoggingOff(self) -> bool - Returns true if the user is logging off. + Returns ``True`` if the user is logging off or ``False`` if the + system is shutting down. This method can only be called for end + session and query end session events, it doesn't make sense for close + window event. """ return _core_.CloseEvent_GetLoggingOff(*args, **kwargs) diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 8dfaadcf1d..ea1699f815 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -49365,6 +49365,156 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"PAPER_A3_EXTRA_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A3_EXTRA_TRANSVERSE))); } + { + PyDict_SetItemString(d,"PAPER_DBL_JAPANESE_POSTCARD", SWIG_From_int((int)(wxPAPER_DBL_JAPANESE_POSTCARD))); + } + { + PyDict_SetItemString(d,"PAPER_A6", SWIG_From_int((int)(wxPAPER_A6))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU2", SWIG_From_int((int)(wxPAPER_JENV_KAKU2))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU3", SWIG_From_int((int)(wxPAPER_JENV_KAKU3))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU3", SWIG_From_int((int)(wxPAPER_JENV_CHOU3))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU4", SWIG_From_int((int)(wxPAPER_JENV_CHOU4))); + } + { + PyDict_SetItemString(d,"PAPER_LETTER_ROTATED", SWIG_From_int((int)(wxPAPER_LETTER_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A3_ROTATED", SWIG_From_int((int)(wxPAPER_A3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A4_ROTATED", SWIG_From_int((int)(wxPAPER_A4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A5_ROTATED", SWIG_From_int((int)(wxPAPER_A5_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_B4_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B4_JIS_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_B5_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B5_JIS_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JAPANESE_POSTCARD_ROTATED", SWIG_From_int((int)(wxPAPER_JAPANESE_POSTCARD_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_DBL_JAPANESE_POSTCARD_ROTATED", SWIG_From_int((int)(wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A6_ROTATED", SWIG_From_int((int)(wxPAPER_A6_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU2_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_KAKU2_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU3_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_KAKU3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU3_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_CHOU3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU4_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_CHOU4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_B6_JIS", SWIG_From_int((int)(wxPAPER_B6_JIS))); + } + { + PyDict_SetItemString(d,"PAPER_B6_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B6_JIS_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_12X11", SWIG_From_int((int)(wxPAPER_12X11))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_YOU4", SWIG_From_int((int)(wxPAPER_JENV_YOU4))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_YOU4_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_YOU4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_P16K", SWIG_From_int((int)(wxPAPER_P16K))); + } + { + PyDict_SetItemString(d,"PAPER_P32K", SWIG_From_int((int)(wxPAPER_P32K))); + } + { + PyDict_SetItemString(d,"PAPER_P32KBIG", SWIG_From_int((int)(wxPAPER_P32KBIG))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_1", SWIG_From_int((int)(wxPAPER_PENV_1))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_2", SWIG_From_int((int)(wxPAPER_PENV_2))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_3", SWIG_From_int((int)(wxPAPER_PENV_3))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_4", SWIG_From_int((int)(wxPAPER_PENV_4))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_5", SWIG_From_int((int)(wxPAPER_PENV_5))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_6", SWIG_From_int((int)(wxPAPER_PENV_6))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_7", SWIG_From_int((int)(wxPAPER_PENV_7))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_8", SWIG_From_int((int)(wxPAPER_PENV_8))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_9", SWIG_From_int((int)(wxPAPER_PENV_9))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_10", SWIG_From_int((int)(wxPAPER_PENV_10))); + } + { + PyDict_SetItemString(d,"PAPER_P16K_ROTATED", SWIG_From_int((int)(wxPAPER_P16K_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_P32K_ROTATED", SWIG_From_int((int)(wxPAPER_P32K_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_P32KBIG_ROTATED", SWIG_From_int((int)(wxPAPER_P32KBIG_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_1_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_1_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_2_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_2_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_3_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_4_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_5_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_5_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_6_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_6_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_7_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_7_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_8_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_8_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_9_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_9_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_10_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_10_ROTATED))); + } { PyDict_SetItemString(d,"DUPLEX_SIMPLEX", SWIG_From_int((int)(wxDUPLEX_SIMPLEX))); } diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py index 4144cc5f1b..f4c4da1835 100644 --- a/wxPython/src/mac/_windows.py +++ b/wxPython/src/mac/_windows.py @@ -2628,11 +2628,22 @@ class MultiChoiceDialog(Dialog): 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, - List choices=[], long style=CHOICEDLG_STYLE, + __init__(self, Window parent, String message, String caption, + List choices=None, long style=CHOICEDLG_STYLE, Point pos=DefaultPosition) -> MultiChoiceDialog - Constructor. Use ShowModal method to show the dialog. + Constructor. Use the `ShowModal` method to show the dialog. + + :param parent: The parent window. + :param message: Text to display above the list of selections. + :param caption: Text to use in the title bar of the dialog. + :param choices: A list of strings or unicode objects that the + user is allowed to choose from. + :param style: Styles to apply to the dialog. The default value is + equivallent to wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER|wx.OK|wx.CANCEL|wx.CENTER. + :param pos: Where to position the dialog (not used on Windows) + + """ newobj = _windows_.new_MultiChoiceDialog(*args, **kwargs) self.this = newobj.this @@ -2645,7 +2656,8 @@ class MultiChoiceDialog(Dialog): SetSelections(List selections) Specify the items in the list that should be selected, using a list of - integers. + integers. The list should specify the indexes of the items that + should be selected. """ return _windows_.MultiChoiceDialog_SetSelections(*args, **kwargs) @@ -2654,6 +2666,7 @@ class MultiChoiceDialog(Dialog): GetSelections() -> [selections] Returns a list of integers representing the items that are selected. + If an item is selected then its index will appear in the list. """ return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs) diff --git a/wxPython/src/mac/media.py b/wxPython/src/mac/media.py index fa5423c269..a747b41bf0 100644 --- a/wxPython/src/mac/media.py +++ b/wxPython/src/mac/media.py @@ -112,6 +112,14 @@ class MediaCtrl(_core.Control): """Stop(self) -> bool""" return _media.MediaCtrl_Stop(*args, **kwargs) + def GetVolume(*args, **kwargs): + """GetVolume(self) -> double""" + return _media.MediaCtrl_GetVolume(*args, **kwargs) + + def SetVolume(*args, **kwargs): + """SetVolume(self, double dVolume) -> bool""" + return _media.MediaCtrl_SetVolume(*args, **kwargs) + def Load(*args, **kwargs): """Load(self, String fileName) -> bool""" return _media.MediaCtrl_Load(*args, **kwargs) diff --git a/wxPython/src/mac/media_wrap.cpp b/wxPython/src/mac/media_wrap.cpp index 9dd67b4079..ac66c0c9db 100644 --- a/wxPython/src/mac/media_wrap.cpp +++ b/wxPython/src/mac/media_wrap.cpp @@ -1435,6 +1435,9 @@ public: wxFileOffset Tell() { return 0; } wxFileOffset Length() { return 0; } + + double GetVolume() { return 0.0; } + bool SetVolume(double dVolume) { return false; } }; const wxEventType wxEVT_MEDIA_FINISHED = 0; @@ -1561,9 +1564,6 @@ SWIG_Check_long(PyObject* obj) return SWIG_AsVal_long(obj, (long*)0); } -static bool wxMediaCtrl_LoadFromURI(wxMediaCtrl *self,wxString const &location){ - return self->Load(wxURI(location)); - } /*@/opt/swig/share/swig/1.3.24/python/pymacros.swg,66,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble @@ -1604,6 +1604,9 @@ SWIG_Check_double(PyObject* obj) return SWIG_AsVal_double(obj, (double*)0); } +static bool wxMediaCtrl_LoadFromURI(wxMediaCtrl *self,wxString const &location){ + return self->Load(wxURI(location)); + } #ifdef __cplusplus extern "C" { #endif @@ -2050,6 +2053,68 @@ static PyObject *_wrap_MediaCtrl_Stop(PyObject *, PyObject *args, PyObject *kwar } +static PyObject *_wrap_MediaCtrl_GetVolume(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxMediaCtrl *arg1 = (wxMediaCtrl *) 0 ; + double result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MediaCtrl_GetVolume",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMediaCtrl, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (double)(arg1)->GetVolume(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_double((double)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_MediaCtrl_SetVolume(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxMediaCtrl *arg1 = (wxMediaCtrl *) 0 ; + double arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "dVolume", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MediaCtrl_SetVolume",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMediaCtrl, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (double)(SWIG_As_double(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->SetVolume(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_MediaCtrl_Load(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMediaCtrl *arg1 = (wxMediaCtrl *) 0 ; @@ -2351,6 +2416,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"MediaCtrl_Play", (PyCFunction) _wrap_MediaCtrl_Play, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MediaCtrl_Pause", (PyCFunction) _wrap_MediaCtrl_Pause, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MediaCtrl_Stop", (PyCFunction) _wrap_MediaCtrl_Stop, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MediaCtrl_GetVolume", (PyCFunction) _wrap_MediaCtrl_GetVolume, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MediaCtrl_SetVolume", (PyCFunction) _wrap_MediaCtrl_SetVolume, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MediaCtrl_Load", (PyCFunction) _wrap_MediaCtrl_Load, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MediaCtrl_LoadFromURI", (PyCFunction) _wrap_MediaCtrl_LoadFromURI, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MediaCtrl_GetState", (PyCFunction) _wrap_MediaCtrl_GetState, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 5d345a1258..b0ee1dcaa8 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -596,6 +596,56 @@ PAPER_B5_EXTRA = _core_.PAPER_B5_EXTRA PAPER_A2 = _core_.PAPER_A2 PAPER_A3_TRANSVERSE = _core_.PAPER_A3_TRANSVERSE PAPER_A3_EXTRA_TRANSVERSE = _core_.PAPER_A3_EXTRA_TRANSVERSE +PAPER_DBL_JAPANESE_POSTCARD = _core_.PAPER_DBL_JAPANESE_POSTCARD +PAPER_A6 = _core_.PAPER_A6 +PAPER_JENV_KAKU2 = _core_.PAPER_JENV_KAKU2 +PAPER_JENV_KAKU3 = _core_.PAPER_JENV_KAKU3 +PAPER_JENV_CHOU3 = _core_.PAPER_JENV_CHOU3 +PAPER_JENV_CHOU4 = _core_.PAPER_JENV_CHOU4 +PAPER_LETTER_ROTATED = _core_.PAPER_LETTER_ROTATED +PAPER_A3_ROTATED = _core_.PAPER_A3_ROTATED +PAPER_A4_ROTATED = _core_.PAPER_A4_ROTATED +PAPER_A5_ROTATED = _core_.PAPER_A5_ROTATED +PAPER_B4_JIS_ROTATED = _core_.PAPER_B4_JIS_ROTATED +PAPER_B5_JIS_ROTATED = _core_.PAPER_B5_JIS_ROTATED +PAPER_JAPANESE_POSTCARD_ROTATED = _core_.PAPER_JAPANESE_POSTCARD_ROTATED +PAPER_DBL_JAPANESE_POSTCARD_ROTATED = _core_.PAPER_DBL_JAPANESE_POSTCARD_ROTATED +PAPER_A6_ROTATED = _core_.PAPER_A6_ROTATED +PAPER_JENV_KAKU2_ROTATED = _core_.PAPER_JENV_KAKU2_ROTATED +PAPER_JENV_KAKU3_ROTATED = _core_.PAPER_JENV_KAKU3_ROTATED +PAPER_JENV_CHOU3_ROTATED = _core_.PAPER_JENV_CHOU3_ROTATED +PAPER_JENV_CHOU4_ROTATED = _core_.PAPER_JENV_CHOU4_ROTATED +PAPER_B6_JIS = _core_.PAPER_B6_JIS +PAPER_B6_JIS_ROTATED = _core_.PAPER_B6_JIS_ROTATED +PAPER_12X11 = _core_.PAPER_12X11 +PAPER_JENV_YOU4 = _core_.PAPER_JENV_YOU4 +PAPER_JENV_YOU4_ROTATED = _core_.PAPER_JENV_YOU4_ROTATED +PAPER_P16K = _core_.PAPER_P16K +PAPER_P32K = _core_.PAPER_P32K +PAPER_P32KBIG = _core_.PAPER_P32KBIG +PAPER_PENV_1 = _core_.PAPER_PENV_1 +PAPER_PENV_2 = _core_.PAPER_PENV_2 +PAPER_PENV_3 = _core_.PAPER_PENV_3 +PAPER_PENV_4 = _core_.PAPER_PENV_4 +PAPER_PENV_5 = _core_.PAPER_PENV_5 +PAPER_PENV_6 = _core_.PAPER_PENV_6 +PAPER_PENV_7 = _core_.PAPER_PENV_7 +PAPER_PENV_8 = _core_.PAPER_PENV_8 +PAPER_PENV_9 = _core_.PAPER_PENV_9 +PAPER_PENV_10 = _core_.PAPER_PENV_10 +PAPER_P16K_ROTATED = _core_.PAPER_P16K_ROTATED +PAPER_P32K_ROTATED = _core_.PAPER_P32K_ROTATED +PAPER_P32KBIG_ROTATED = _core_.PAPER_P32KBIG_ROTATED +PAPER_PENV_1_ROTATED = _core_.PAPER_PENV_1_ROTATED +PAPER_PENV_2_ROTATED = _core_.PAPER_PENV_2_ROTATED +PAPER_PENV_3_ROTATED = _core_.PAPER_PENV_3_ROTATED +PAPER_PENV_4_ROTATED = _core_.PAPER_PENV_4_ROTATED +PAPER_PENV_5_ROTATED = _core_.PAPER_PENV_5_ROTATED +PAPER_PENV_6_ROTATED = _core_.PAPER_PENV_6_ROTATED +PAPER_PENV_7_ROTATED = _core_.PAPER_PENV_7_ROTATED +PAPER_PENV_8_ROTATED = _core_.PAPER_PENV_8_ROTATED +PAPER_PENV_9_ROTATED = _core_.PAPER_PENV_9_ROTATED +PAPER_PENV_10_ROTATED = _core_.PAPER_PENV_10_ROTATED DUPLEX_SIMPLEX = _core_.DUPLEX_SIMPLEX DUPLEX_HORIZONTAL = _core_.DUPLEX_HORIZONTAL DUPLEX_VERTICAL = _core_.DUPLEX_VERTICAL @@ -5485,7 +5535,10 @@ class CloseEvent(Event): """ GetLoggingOff(self) -> bool - Returns true if the user is logging off. + Returns ``True`` if the user is logging off or ``False`` if the + system is shutting down. This method can only be called for end + session and query end session events, it doesn't make sense for close + window event. """ return _core_.CloseEvent_GetLoggingOff(*args, **kwargs) diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 17c3326113..66d5655700 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -49384,6 +49384,156 @@ SWIGEXPORT(void) SWIG_init(void) { { PyDict_SetItemString(d,"PAPER_A3_EXTRA_TRANSVERSE", SWIG_From_int((int)(wxPAPER_A3_EXTRA_TRANSVERSE))); } + { + PyDict_SetItemString(d,"PAPER_DBL_JAPANESE_POSTCARD", SWIG_From_int((int)(wxPAPER_DBL_JAPANESE_POSTCARD))); + } + { + PyDict_SetItemString(d,"PAPER_A6", SWIG_From_int((int)(wxPAPER_A6))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU2", SWIG_From_int((int)(wxPAPER_JENV_KAKU2))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU3", SWIG_From_int((int)(wxPAPER_JENV_KAKU3))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU3", SWIG_From_int((int)(wxPAPER_JENV_CHOU3))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU4", SWIG_From_int((int)(wxPAPER_JENV_CHOU4))); + } + { + PyDict_SetItemString(d,"PAPER_LETTER_ROTATED", SWIG_From_int((int)(wxPAPER_LETTER_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A3_ROTATED", SWIG_From_int((int)(wxPAPER_A3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A4_ROTATED", SWIG_From_int((int)(wxPAPER_A4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A5_ROTATED", SWIG_From_int((int)(wxPAPER_A5_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_B4_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B4_JIS_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_B5_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B5_JIS_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JAPANESE_POSTCARD_ROTATED", SWIG_From_int((int)(wxPAPER_JAPANESE_POSTCARD_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_DBL_JAPANESE_POSTCARD_ROTATED", SWIG_From_int((int)(wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_A6_ROTATED", SWIG_From_int((int)(wxPAPER_A6_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU2_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_KAKU2_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_KAKU3_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_KAKU3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU3_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_CHOU3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_CHOU4_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_CHOU4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_B6_JIS", SWIG_From_int((int)(wxPAPER_B6_JIS))); + } + { + PyDict_SetItemString(d,"PAPER_B6_JIS_ROTATED", SWIG_From_int((int)(wxPAPER_B6_JIS_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_12X11", SWIG_From_int((int)(wxPAPER_12X11))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_YOU4", SWIG_From_int((int)(wxPAPER_JENV_YOU4))); + } + { + PyDict_SetItemString(d,"PAPER_JENV_YOU4_ROTATED", SWIG_From_int((int)(wxPAPER_JENV_YOU4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_P16K", SWIG_From_int((int)(wxPAPER_P16K))); + } + { + PyDict_SetItemString(d,"PAPER_P32K", SWIG_From_int((int)(wxPAPER_P32K))); + } + { + PyDict_SetItemString(d,"PAPER_P32KBIG", SWIG_From_int((int)(wxPAPER_P32KBIG))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_1", SWIG_From_int((int)(wxPAPER_PENV_1))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_2", SWIG_From_int((int)(wxPAPER_PENV_2))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_3", SWIG_From_int((int)(wxPAPER_PENV_3))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_4", SWIG_From_int((int)(wxPAPER_PENV_4))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_5", SWIG_From_int((int)(wxPAPER_PENV_5))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_6", SWIG_From_int((int)(wxPAPER_PENV_6))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_7", SWIG_From_int((int)(wxPAPER_PENV_7))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_8", SWIG_From_int((int)(wxPAPER_PENV_8))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_9", SWIG_From_int((int)(wxPAPER_PENV_9))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_10", SWIG_From_int((int)(wxPAPER_PENV_10))); + } + { + PyDict_SetItemString(d,"PAPER_P16K_ROTATED", SWIG_From_int((int)(wxPAPER_P16K_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_P32K_ROTATED", SWIG_From_int((int)(wxPAPER_P32K_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_P32KBIG_ROTATED", SWIG_From_int((int)(wxPAPER_P32KBIG_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_1_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_1_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_2_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_2_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_3_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_3_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_4_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_4_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_5_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_5_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_6_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_6_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_7_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_7_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_8_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_8_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_9_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_9_ROTATED))); + } + { + PyDict_SetItemString(d,"PAPER_PENV_10_ROTATED", SWIG_From_int((int)(wxPAPER_PENV_10_ROTATED))); + } { PyDict_SetItemString(d,"DUPLEX_SIMPLEX", SWIG_From_int((int)(wxDUPLEX_SIMPLEX))); } diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index 8b9861bc3f..bdd35c5553 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -2656,11 +2656,22 @@ class MultiChoiceDialog(Dialog): 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, - List choices=[], long style=CHOICEDLG_STYLE, + __init__(self, Window parent, String message, String caption, + List choices=None, long style=CHOICEDLG_STYLE, Point pos=DefaultPosition) -> MultiChoiceDialog - Constructor. Use ShowModal method to show the dialog. + Constructor. Use the `ShowModal` method to show the dialog. + + :param parent: The parent window. + :param message: Text to display above the list of selections. + :param caption: Text to use in the title bar of the dialog. + :param choices: A list of strings or unicode objects that the + user is allowed to choose from. + :param style: Styles to apply to the dialog. The default value is + equivallent to wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER|wx.OK|wx.CANCEL|wx.CENTER. + :param pos: Where to position the dialog (not used on Windows) + + """ newobj = _windows_.new_MultiChoiceDialog(*args, **kwargs) self.this = newobj.this @@ -2673,7 +2684,8 @@ class MultiChoiceDialog(Dialog): SetSelections(List selections) Specify the items in the list that should be selected, using a list of - integers. + integers. The list should specify the indexes of the items that + should be selected. """ return _windows_.MultiChoiceDialog_SetSelections(*args, **kwargs) @@ -2682,6 +2694,7 @@ class MultiChoiceDialog(Dialog): GetSelections() -> [selections] Returns a list of integers representing the items that are selected. + If an item is selected then its index will appear in the list. """ return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs) diff --git a/wxPython/src/msw/media.py b/wxPython/src/msw/media.py index fa5423c269..a747b41bf0 100644 --- a/wxPython/src/msw/media.py +++ b/wxPython/src/msw/media.py @@ -112,6 +112,14 @@ class MediaCtrl(_core.Control): """Stop(self) -> bool""" return _media.MediaCtrl_Stop(*args, **kwargs) + def GetVolume(*args, **kwargs): + """GetVolume(self) -> double""" + return _media.MediaCtrl_GetVolume(*args, **kwargs) + + def SetVolume(*args, **kwargs): + """SetVolume(self, double dVolume) -> bool""" + return _media.MediaCtrl_SetVolume(*args, **kwargs) + def Load(*args, **kwargs): """Load(self, String fileName) -> bool""" return _media.MediaCtrl_Load(*args, **kwargs) diff --git a/wxPython/src/msw/media_wrap.cpp b/wxPython/src/msw/media_wrap.cpp index 79ec5b3612..57c113acaf 100644 --- a/wxPython/src/msw/media_wrap.cpp +++ b/wxPython/src/msw/media_wrap.cpp @@ -1435,6 +1435,9 @@ public: wxFileOffset Tell() { return 0; } wxFileOffset Length() { return 0; } + + double GetVolume() { return 0.0; } + bool SetVolume(double dVolume) { return false; } }; const wxEventType wxEVT_MEDIA_FINISHED = 0; @@ -1561,9 +1564,6 @@ SWIG_Check_long(PyObject* obj) return SWIG_AsVal_long(obj, (long*)0); } -static bool wxMediaCtrl_LoadFromURI(wxMediaCtrl *self,wxString const &location){ - return self->Load(wxURI(location)); - } /*@c:\\PROJECTS\\SWIG-cvs\\Lib\\python\\pymacros.swg,66,SWIG_define@*/ #define SWIG_From_double PyFloat_FromDouble @@ -1604,6 +1604,9 @@ SWIG_Check_double(PyObject* obj) return SWIG_AsVal_double(obj, (double*)0); } +static bool wxMediaCtrl_LoadFromURI(wxMediaCtrl *self,wxString const &location){ + return self->Load(wxURI(location)); + } #ifdef __cplusplus extern "C" { #endif @@ -2050,6 +2053,68 @@ static PyObject *_wrap_MediaCtrl_Stop(PyObject *, PyObject *args, PyObject *kwar } +static PyObject *_wrap_MediaCtrl_GetVolume(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxMediaCtrl *arg1 = (wxMediaCtrl *) 0 ; + double result; + PyObject * obj0 = 0 ; + char *kwnames[] = { + (char *) "self", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MediaCtrl_GetVolume",kwnames,&obj0)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMediaCtrl, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (double)(arg1)->GetVolume(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = SWIG_From_double((double)(result)); + } + return resultobj; + fail: + return NULL; +} + + +static PyObject *_wrap_MediaCtrl_SetVolume(PyObject *, PyObject *args, PyObject *kwargs) { + PyObject *resultobj; + wxMediaCtrl *arg1 = (wxMediaCtrl *) 0 ; + double arg2 ; + bool result; + PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; + char *kwnames[] = { + (char *) "self",(char *) "dVolume", NULL + }; + + if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MediaCtrl_SetVolume",kwnames,&obj0,&obj1)) goto fail; + SWIG_Python_ConvertPtr(obj0, (void **)&arg1, SWIGTYPE_p_wxMediaCtrl, SWIG_POINTER_EXCEPTION | 0); + if (SWIG_arg_fail(1)) SWIG_fail; + { + arg2 = (double)(SWIG_As_double(obj1)); + if (SWIG_arg_fail(2)) SWIG_fail; + } + { + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (bool)(arg1)->SetVolume(arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + { + resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj); + } + return resultobj; + fail: + return NULL; +} + + static PyObject *_wrap_MediaCtrl_Load(PyObject *, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxMediaCtrl *arg1 = (wxMediaCtrl *) 0 ; @@ -2351,6 +2416,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"MediaCtrl_Play", (PyCFunction) _wrap_MediaCtrl_Play, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MediaCtrl_Pause", (PyCFunction) _wrap_MediaCtrl_Pause, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MediaCtrl_Stop", (PyCFunction) _wrap_MediaCtrl_Stop, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MediaCtrl_GetVolume", (PyCFunction) _wrap_MediaCtrl_GetVolume, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"MediaCtrl_SetVolume", (PyCFunction) _wrap_MediaCtrl_SetVolume, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MediaCtrl_Load", (PyCFunction) _wrap_MediaCtrl_Load, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MediaCtrl_LoadFromURI", (PyCFunction) _wrap_MediaCtrl_LoadFromURI, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"MediaCtrl_GetState", (PyCFunction) _wrap_MediaCtrl_GetState, METH_VARARGS | METH_KEYWORDS, NULL}, -- 2.45.2