From 48a0c02123fe4f3744856ad4857d1268f1f88377 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 7 Nov 2006 05:20:59 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/gtk/_core.py | 3 ++ wxPython/src/gtk/_gdi.py | 9 +++-- wxPython/src/gtk/_gdi_wrap.cpp | 73 ++++++++++++++++++++++++++++++---- wxPython/src/gtk/_misc.py | 3 -- wxPython/src/mac/_core.py | 3 ++ wxPython/src/mac/_gdi.py | 9 +++-- wxPython/src/mac/_gdi_wrap.cpp | 73 ++++++++++++++++++++++++++++++---- wxPython/src/mac/_misc.py | 3 -- wxPython/src/msw/_core.py | 3 ++ wxPython/src/msw/_gdi.py | 9 +++-- wxPython/src/msw/_gdi_wrap.cpp | 73 ++++++++++++++++++++++++++++++---- wxPython/src/msw/_misc.py | 3 -- 12 files changed, 222 insertions(+), 42 deletions(-) diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index 5593db49c5..a5fd958170 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -7741,6 +7741,9 @@ in on the main display of your Mac.""" # Use Python's install prefix as the default wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix) + # Until the new native control for wxMac is up to par, still use the generic one. + wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1) + # This finishes the initialization of wxWindows and then calls # the OnInit that should be present in the derived class self._BootstrapApp() diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py index 4381b25a94..685cb75907 100644 --- a/wxPython/src/gtk/_gdi.py +++ b/wxPython/src/gtk/_gdi.py @@ -5868,9 +5868,12 @@ class GCDC(DC): """Proxy of C++ GCDC class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr - def __init__(self, *args, **kwargs): - """__init__(self, WindowDC dc) -> GCDC""" - _gdi_.GCDC_swiginit(self,_gdi_.new_GCDC(*args, **kwargs)) + def __init__(self, *args): + """ + __init__(self, WindowDC dc) -> GCDC + __init__(self, Window window) -> GCDC + """ + _gdi_.GCDC_swiginit(self,_gdi_.new_GCDC(*args)) self.__dc = args[0] # save a ref so the other dc will not be deleted before self __swig_destroy__ = _gdi_.delete_GCDC diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp index afe0ba8a52..a3b78807c5 100644 --- a/wxPython/src/gtk/_gdi_wrap.cpp +++ b/wxPython/src/gtk/_gdi_wrap.cpp @@ -3886,6 +3886,13 @@ public: wxPyEndBlockThreads(blocked); } + wxGCDC(const wxWindow*) { + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyErr_SetString(PyExc_NotImplementedError, + "wxGCDC is not available on this platform."); + wxPyEndBlockThreads(blocked); + } + wxGCDC() { wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, @@ -30335,19 +30342,15 @@ SWIGINTERN PyObject *GraphicsRenderer_swigregister(PyObject *SWIGUNUSEDPARM(self return SWIG_Py_Void(); } -SWIGINTERN PyObject *_wrap_new_GCDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_new_GCDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxWindowDC *arg1 = 0 ; wxGCDC *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "dc", NULL - }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_GCDC",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GCDC" "', expected argument " "1"" of type '" "wxWindowDC const &""'"); } @@ -30369,6 +30372,60 @@ fail: } +SWIGINTERN PyObject *_wrap_new_GCDC__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + wxGCDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GCDC" "', expected argument " "1"" of type '" "wxWindow *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxGCDC *)new wxGCDC(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGCDC, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_GCDC(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[2]; + + if (!(argc = SWIG_Python_UnpackTuple(args,"new_GCDC",0,1,argv))) SWIG_fail; + --argc; + if (argc == 1) { + int _v = 0; + { + int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxWindowDC, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + return _wrap_new_GCDC__SWIG_0(self, argc, argv); + } +check_1: + + if (argc == 1) { + return _wrap_new_GCDC__SWIG_1(self, argc, argv); + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_GCDC'"); + return NULL; +} + + SWIGINTERN PyObject *_wrap_delete_GCDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGCDC *arg1 = (wxGCDC *) 0 ; @@ -38907,7 +38964,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsRenderer_CreateRadialGradientBrush", (PyCFunction) _wrap_GraphicsRenderer_CreateRadialGradientBrush, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsRenderer_CreateFont", (PyCFunction) _wrap_GraphicsRenderer_CreateFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsRenderer_swigregister", GraphicsRenderer_swigregister, METH_VARARGS, NULL}, - { (char *)"new_GCDC", (PyCFunction) _wrap_new_GCDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_GCDC", _wrap_new_GCDC, METH_VARARGS, NULL}, { (char *)"delete_GCDC", (PyCFunction)_wrap_delete_GCDC, METH_O, NULL}, { (char *)"GCDC_GetGraphicsContext", (PyCFunction)_wrap_GCDC_GetGraphicsContext, METH_O, NULL}, { (char *)"GCDC_SetGraphicsContext", (PyCFunction) _wrap_GCDC_SetGraphicsContext, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index 0998a0a962..7d699e7932 100644 --- a/wxPython/src/gtk/_misc.py +++ b/wxPython/src/gtk/_misc.py @@ -273,9 +273,6 @@ def SystemOptions_IsFalse(*args, **kwargs): """SystemOptions_IsFalse(String name) -> bool""" return _misc_.SystemOptions_IsFalse(*args, **kwargs) -# Until the new native control for wxMac is up to par, still use the generic one. -SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1) - #--------------------------------------------------------------------------- diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index 5593db49c5..a5fd958170 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -7741,6 +7741,9 @@ in on the main display of your Mac.""" # Use Python's install prefix as the default wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix) + # Until the new native control for wxMac is up to par, still use the generic one. + wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1) + # This finishes the initialization of wxWindows and then calls # the OnInit that should be present in the derived class self._BootstrapApp() diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py index eb52dfc590..fb70ed338f 100644 --- a/wxPython/src/mac/_gdi.py +++ b/wxPython/src/mac/_gdi.py @@ -5895,9 +5895,12 @@ class GCDC(DC): """Proxy of C++ GCDC class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr - def __init__(self, *args, **kwargs): - """__init__(self, WindowDC dc) -> GCDC""" - _gdi_.GCDC_swiginit(self,_gdi_.new_GCDC(*args, **kwargs)) + def __init__(self, *args): + """ + __init__(self, WindowDC dc) -> GCDC + __init__(self, Window window) -> GCDC + """ + _gdi_.GCDC_swiginit(self,_gdi_.new_GCDC(*args)) self.__dc = args[0] # save a ref so the other dc will not be deleted before self __swig_destroy__ = _gdi_.delete_GCDC diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp index 19804ecbff..8a00e5616f 100644 --- a/wxPython/src/mac/_gdi_wrap.cpp +++ b/wxPython/src/mac/_gdi_wrap.cpp @@ -3890,6 +3890,13 @@ public: wxPyEndBlockThreads(blocked); } + wxGCDC(const wxWindow*) { + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyErr_SetString(PyExc_NotImplementedError, + "wxGCDC is not available on this platform."); + wxPyEndBlockThreads(blocked); + } + wxGCDC() { wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, @@ -30544,19 +30551,15 @@ SWIGINTERN PyObject *GraphicsRenderer_swigregister(PyObject *SWIGUNUSEDPARM(self return SWIG_Py_Void(); } -SWIGINTERN PyObject *_wrap_new_GCDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_new_GCDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxWindowDC *arg1 = 0 ; wxGCDC *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "dc", NULL - }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_GCDC",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GCDC" "', expected argument " "1"" of type '" "wxWindowDC const &""'"); } @@ -30578,6 +30581,60 @@ fail: } +SWIGINTERN PyObject *_wrap_new_GCDC__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + wxGCDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GCDC" "', expected argument " "1"" of type '" "wxWindow *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxGCDC *)new wxGCDC(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGCDC, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_GCDC(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[2]; + + if (!(argc = SWIG_Python_UnpackTuple(args,"new_GCDC",0,1,argv))) SWIG_fail; + --argc; + if (argc == 1) { + int _v = 0; + { + int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxWindowDC, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + return _wrap_new_GCDC__SWIG_0(self, argc, argv); + } +check_1: + + if (argc == 1) { + return _wrap_new_GCDC__SWIG_1(self, argc, argv); + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_GCDC'"); + return NULL; +} + + SWIGINTERN PyObject *_wrap_delete_GCDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGCDC *arg1 = (wxGCDC *) 0 ; @@ -39123,7 +39180,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsRenderer_CreateRadialGradientBrush", (PyCFunction) _wrap_GraphicsRenderer_CreateRadialGradientBrush, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsRenderer_CreateFont", (PyCFunction) _wrap_GraphicsRenderer_CreateFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsRenderer_swigregister", GraphicsRenderer_swigregister, METH_VARARGS, NULL}, - { (char *)"new_GCDC", (PyCFunction) _wrap_new_GCDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_GCDC", _wrap_new_GCDC, METH_VARARGS, NULL}, { (char *)"delete_GCDC", (PyCFunction)_wrap_delete_GCDC, METH_O, NULL}, { (char *)"GCDC_GetGraphicsContext", (PyCFunction)_wrap_GCDC_GetGraphicsContext, METH_O, NULL}, { (char *)"GCDC_SetGraphicsContext", (PyCFunction) _wrap_GCDC_SetGraphicsContext, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py index 40d2696f99..c235d630ad 100644 --- a/wxPython/src/mac/_misc.py +++ b/wxPython/src/mac/_misc.py @@ -273,9 +273,6 @@ def SystemOptions_IsFalse(*args, **kwargs): """SystemOptions_IsFalse(String name) -> bool""" return _misc_.SystemOptions_IsFalse(*args, **kwargs) -# Until the new native control for wxMac is up to par, still use the generic one. -SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1) - #--------------------------------------------------------------------------- diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index 9ea4343831..472238e0d9 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -7741,6 +7741,9 @@ in on the main display of your Mac.""" # Use Python's install prefix as the default wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix) + # Until the new native control for wxMac is up to par, still use the generic one. + wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1) + # This finishes the initialization of wxWindows and then calls # the OnInit that should be present in the derived class self._BootstrapApp() diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py index 23cc061890..aa6ca27e52 100644 --- a/wxPython/src/msw/_gdi.py +++ b/wxPython/src/msw/_gdi.py @@ -5993,9 +5993,12 @@ class GCDC(DC): """Proxy of C++ GCDC class""" thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag') __repr__ = _swig_repr - def __init__(self, *args, **kwargs): - """__init__(self, WindowDC dc) -> GCDC""" - _gdi_.GCDC_swiginit(self,_gdi_.new_GCDC(*args, **kwargs)) + def __init__(self, *args): + """ + __init__(self, WindowDC dc) -> GCDC + __init__(self, Window window) -> GCDC + """ + _gdi_.GCDC_swiginit(self,_gdi_.new_GCDC(*args)) self.__dc = args[0] # save a ref so the other dc will not be deleted before self __swig_destroy__ = _gdi_.delete_GCDC diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp index 24d9da3f49..36361c4db3 100644 --- a/wxPython/src/msw/_gdi_wrap.cpp +++ b/wxPython/src/msw/_gdi_wrap.cpp @@ -3868,6 +3868,13 @@ public: wxPyEndBlockThreads(blocked); } + wxGCDC(const wxWindow*) { + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + PyErr_SetString(PyExc_NotImplementedError, + "wxGCDC is not available on this platform."); + wxPyEndBlockThreads(blocked); + } + wxGCDC() { wxPyBlock_t blocked = wxPyBeginBlockThreads(); PyErr_SetString(PyExc_NotImplementedError, @@ -31284,19 +31291,15 @@ SWIGINTERN PyObject *GraphicsRenderer_swigregister(PyObject *SWIGUNUSEDPARM(self return SWIG_Py_Void(); } -SWIGINTERN PyObject *_wrap_new_GCDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) { +SWIGINTERN PyObject *_wrap_new_GCDC__SWIG_0(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; wxWindowDC *arg1 = 0 ; wxGCDC *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; - PyObject * obj0 = 0 ; - char * kwnames[] = { - (char *) "dc", NULL - }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:new_GCDC",kwnames,&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_wxWindowDC, 0 | 0); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GCDC" "', expected argument " "1"" of type '" "wxWindowDC const &""'"); } @@ -31318,6 +31321,60 @@ fail: } +SWIGINTERN PyObject *_wrap_new_GCDC__SWIG_1(PyObject *SWIGUNUSEDPARM(self), int nobjs, PyObject **swig_obj) { + PyObject *resultobj = 0; + wxWindow *arg1 = (wxWindow *) 0 ; + wxGCDC *result = 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + + if ((nobjs < 1) || (nobjs > 1)) SWIG_fail; + res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_GCDC" "', expected argument " "1"" of type '" "wxWindow *""'"); + } + arg1 = reinterpret_cast< wxWindow * >(argp1); + { + if (!wxPyCheckForApp()) SWIG_fail; + PyThreadState* __tstate = wxPyBeginAllowThreads(); + result = (wxGCDC *)new wxGCDC(arg1); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) SWIG_fail; + } + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxGCDC, SWIG_POINTER_NEW | 0 ); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_new_GCDC(PyObject *self, PyObject *args) { + int argc; + PyObject *argv[2]; + + if (!(argc = SWIG_Python_UnpackTuple(args,"new_GCDC",0,1,argv))) SWIG_fail; + --argc; + if (argc == 1) { + int _v = 0; + { + int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_wxWindowDC, 0); + _v = SWIG_CheckState(res); + } + if (!_v) goto check_1; + return _wrap_new_GCDC__SWIG_0(self, argc, argv); + } +check_1: + + if (argc == 1) { + return _wrap_new_GCDC__SWIG_1(self, argc, argv); + } + +fail: + SWIG_SetErrorMsg(PyExc_NotImplementedError,"No matching function for overloaded 'new_GCDC'"); + return NULL; +} + + SWIGINTERN PyObject *_wrap_delete_GCDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; wxGCDC *arg1 = (wxGCDC *) 0 ; @@ -39885,7 +39942,7 @@ static PyMethodDef SwigMethods[] = { { (char *)"GraphicsRenderer_CreateRadialGradientBrush", (PyCFunction) _wrap_GraphicsRenderer_CreateRadialGradientBrush, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsRenderer_CreateFont", (PyCFunction) _wrap_GraphicsRenderer_CreateFont, METH_VARARGS | METH_KEYWORDS, NULL}, { (char *)"GraphicsRenderer_swigregister", GraphicsRenderer_swigregister, METH_VARARGS, NULL}, - { (char *)"new_GCDC", (PyCFunction) _wrap_new_GCDC, METH_VARARGS | METH_KEYWORDS, NULL}, + { (char *)"new_GCDC", _wrap_new_GCDC, METH_VARARGS, NULL}, { (char *)"delete_GCDC", (PyCFunction)_wrap_delete_GCDC, METH_O, NULL}, { (char *)"GCDC_GetGraphicsContext", (PyCFunction)_wrap_GCDC_GetGraphicsContext, METH_O, NULL}, { (char *)"GCDC_SetGraphicsContext", (PyCFunction) _wrap_GCDC_SetGraphicsContext, METH_VARARGS | METH_KEYWORDS, NULL}, diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py index 40d2696f99..c235d630ad 100644 --- a/wxPython/src/msw/_misc.py +++ b/wxPython/src/msw/_misc.py @@ -273,9 +273,6 @@ def SystemOptions_IsFalse(*args, **kwargs): """SystemOptions_IsFalse(String name) -> bool""" return _misc_.SystemOptions_IsFalse(*args, **kwargs) -# Until the new native control for wxMac is up to par, still use the generic one. -SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1) - #--------------------------------------------------------------------------- -- 2.45.2