reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/ogl/msw/ogl.py b/wxPython/contrib/ogl/msw/ogl.py
index 750f38a0df56221ab7461f85d597c06e67aec926..cd62438e2df8dca608eea0ffd9ef53f71f01b41f 100644 (file)
--- 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 5b40b524219e86fadd3b23002095c101b6427544..d6f14669a0f0720067f85bd264c946748d1b3ebf 100644 (file)
--- 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 bb99361d27e0acfdc5af6182cc313f4d63cc03e8..285cef83186bf8cfa7e42b9fecfd9be56db3e1e7 100644 (file)
--- 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; i<count; i++) {
-
-
-
-                PyList_SetItem(list, i, PyString_FromString((const char*)files[i]));
-
+                PyList_SetItem(list, i, wx2PyString(files[i]));
             }
             return list;
         }
@@ -30642,8 +30638,8 @@ static PyObject *_wrap_Sizer_SetDimension(PyObject *self, PyObject *args, PyObje
 static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
     wxSizer *arg1 = (wxSizer *) 0 ;
-    wxSize arg2 ;
-    wxSize *argp2 ;
+    wxSize *arg2 = 0 ;
+    wxSize temp2 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
     char *kwnames[] = {
@@ -30652,11 +30648,13 @@ static PyObject *_wrap_Sizer_SetMinSize(PyObject *self, PyObject *args, PyObject
     
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetMinSize",kwnames,&obj0,&obj1)) goto fail;
     if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxSizer,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    if ((SWIG_ConvertPtr(obj1,(void **) &argp2, SWIGTYPE_p_wxSize,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail;
-    arg2 = *argp2; 
+    {
+        arg2 = &temp2;
+        if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
+    }
     {
         PyThreadState* __tstate = wxPyBeginAllowThreads();
-        (arg1)->SetMinSize(arg2);
+        (arg1)->SetMinSize((wxSize const &)*arg2);
         
         wxPyEndAllowThreads(__tstate);
         if (PyErr_Occurred()) SWIG_fail;