reSWIGged with the new SWIG runtime and also other recent changes

[wxWidgets.git] / wxPython / src / mac / misc_wrap.cpp

diff --git a/wxPython/src/mac/misc_wrap.cpp b/wxPython/src/mac/misc_wrap.cpp
index e577c23dc4ec4d5adce85b094a410a918f27e2ad..0bdc83935670d9a8153c943e702bcfe3f1cda057 100644 (file)
--- a/wxPython/src/mac/misc_wrap.cpp
+++ b/wxPython/src/mac/misc_wrap.cpp
@@ -840,8 +840,8 @@ bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool defaultVa
 #include <wx/datetime.h>
 
 
 #include <wx/datetime.h>
 
 

- static const wxString wxPyDateFormatStr(wxT(wxT("%c"))); 
- static const wxString wxPyTimeSpanFormatStr(wxT(wxT("%H:%M:%S"))); 
+ static const wxString wxPyDateFormatStr(wxT("%c")); 
+ static const wxString wxPyTimeSpanFormatStr(wxT("%H:%M:%S")); 

 
 #define LOCAL_TZ wxDateTime::Local
 
 
 #define LOCAL_TZ wxDateTime::Local
 


@@ -1042,8 +1042,6 @@ PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){
 #include <wx/metafile.h>
 
 
 #include <wx/metafile.h>
 
 

-
-

 IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback);
 
 
 IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback);
 
 


@@ -23297,7 +23295,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject *
 
 static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;
 
 static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject *resultobj;

-    wxWindow *arg1 = (wxWindow *) NULL ;
+    wxWindow *arg1 = (wxWindow *) 0 ;

     wxCursor const &arg2_defvalue = wxNullCursor ;
     wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
     wxCursor const &arg3_defvalue = wxNullCursor ;
     wxCursor const &arg2_defvalue = wxNullCursor ;
     wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
     wxCursor const &arg3_defvalue = wxNullCursor ;


@@ -23313,10 +23311,8 @@ static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *
         (char *) "win",(char *) "copy",(char *) "move",(char *) "none", NULL 
     };
     
         (char *) "win",(char *) "copy",(char *) "move",(char *) "none", NULL 
     };
     

-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_DropSource",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
-    if (obj0) {
-        if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
-    }
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_DropSource",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;

     if (obj1) {
         if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
         if (arg2 == NULL) {
     if (obj1) {
         if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
         if (arg2 == NULL) {