From a64def1139abed0726da69f5cc93273468260e77 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 24 Nov 2003 19:20:14 +0000 Subject: [PATCH] reSWIGged git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/contrib/ogl/msw/ogl.py | 2 +- wxPython/contrib/ogl/msw/ogl_wrap.cpp | 2 +- wxPython/src/msw/core_wrap.cpp | 26 ++++++++++++-------------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/wxPython/contrib/ogl/msw/ogl.py b/wxPython/contrib/ogl/msw/ogl.py index 750f38a0df..cd62438e2d 100644 --- a/wxPython/contrib/ogl/msw/ogl.py +++ b/wxPython/contrib/ogl/msw/ogl.py @@ -694,7 +694,7 @@ class PyShape(PyShapeEvtHandler): return _ogl.PyShape_GetRegionId(*args, **kwargs) def NameRegions(*args, **kwargs): - """NameRegions(wxString parentName="")""" + """NameRegions(wxString parentName=wxPyEmptyString)""" return _ogl.PyShape_NameRegions(*args, **kwargs) def GetRegions(*args, **kwargs): diff --git a/wxPython/contrib/ogl/msw/ogl_wrap.cpp b/wxPython/contrib/ogl/msw/ogl_wrap.cpp index 5b40b52421..d6f14669a0 100644 --- a/wxPython/contrib/ogl/msw/ogl_wrap.cpp +++ b/wxPython/contrib/ogl/msw/ogl_wrap.cpp @@ -5305,7 +5305,7 @@ static PyObject *_wrap_PyShape_GetRegionId(PyObject *self, PyObject *args, PyObj static PyObject *_wrap_PyShape_NameRegions(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject *resultobj; wxPyShape *arg1 = (wxPyShape *) 0 ; - wxString const &arg2_defvalue = "" ; + wxString const &arg2_defvalue = wxPyEmptyString ; wxString *arg2 = (wxString *) &arg2_defvalue ; bool temp2 = False ; PyObject * obj0 = 0 ; diff --git a/wxPython/src/msw/core_wrap.cpp b/wxPython/src/msw/core_wrap.cpp index bb99361d27..285cef8318 100644 --- a/wxPython/src/msw/core_wrap.cpp +++ b/wxPython/src/msw/core_wrap.cpp @@ -929,11 +929,11 @@ void wxEvtHandler__setOORInfo(wxEvtHandler *self,PyObject *_self){ } } int wxKeyEvent_GetUniChar(wxKeyEvent *self){ - - - + #if wxUSE_UNICODE + return self->m_uniChar; + #else return 0; - + #endif } void wxSizeEvent_SetSize(wxSizeEvent *self,wxSize size){ self->m_size = size; @@ -952,11 +952,7 @@ PyObject *wxDropFilesEvent_GetFiles(wxDropFilesEvent *self){ } for (int i=0; iSetMinSize(arg2); + (arg1)->SetMinSize((wxSize const &)*arg2); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail;