undo last change

[wxWidgets.git] / wxPython / src / gtk / calendar_wrap.cpp

diff --git a/wxPython/src/gtk/calendar_wrap.cpp b/wxPython/src/gtk/calendar_wrap.cpp
index fa6f8de4461338afe1788dc9f5e489ee7b93cf50..f9ad0676162ce7df5286f2d3db2ff9c19de26e62 100644 (file)
--- a/wxPython/src/gtk/calendar_wrap.cpp
+++ b/wxPython/src/gtk/calendar_wrap.cpp
@@ -1253,7 +1253,7 @@ static PyObject *_wrap_new_CalendarCtrl(PyObject *self, PyObject *args, PyObject
         result = (wxCalendarCtrl *)new wxCalendarCtrl(arg1,arg2,(wxDateTime const &)*arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7);
         
         wxPyEndAllowThreads(__tstate);
         result = (wxCalendarCtrl *)new wxCalendarCtrl(arg1,arg2,(wxDateTime const &)*arg3,(wxPoint const &)*arg4,(wxSize const &)*arg5,arg6,(wxString const &)*arg7);
         
         wxPyEndAllowThreads(__tstate);

-        if (PyErr_Occurred()) SWIG_fail;    
+        if (PyErr_Occurred()) SWIG_fail;

     }
     resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCalendarCtrl, 1);
     {
     }
     resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCalendarCtrl, 1);
     {


@@ -1284,7 +1284,7 @@ static PyObject *_wrap_new_PreCalendarCtrl(PyObject *self, PyObject *args, PyObj
         result = (wxCalendarCtrl *)new wxCalendarCtrl();
         
         wxPyEndAllowThreads(__tstate);
         result = (wxCalendarCtrl *)new wxCalendarCtrl();
         
         wxPyEndAllowThreads(__tstate);

-        if (PyErr_Occurred()) SWIG_fail;    
+        if (PyErr_Occurred()) SWIG_fail;

     }
     resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCalendarCtrl, 1);
     return resultobj;
     }
     resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCalendarCtrl, 1);
     return resultobj;


@@ -2203,7 +2203,7 @@ static PyObject *_wrap_CalendarCtrl_GetMonthControl(PyObject *self, PyObject *ar
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {

-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -2231,7 +2231,7 @@ static PyObject *_wrap_CalendarCtrl_GetYearControl(PyObject *self, PyObject *arg
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {

-        resultobj = wxPyMake_wxObject(result); 
+        resultobj = wxPyMake_wxObject(result, 0); 

     }
     return resultobj;
     fail:
     }
     return resultobj;
     fail:


@@ -2254,6 +2254,7 @@ static PyObject *_wrap_CalendarCtrl_GetClassDefaultAttributes(PyObject *self, Py
         if (PyErr_Occurred()) SWIG_fail;
     }
     {
         if (PyErr_Occurred()) SWIG_fail;
     }
     {

+        if (!wxPyCheckForApp()) SWIG_fail;

         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxCalendarCtrl::GetClassDefaultAttributes((wxWindowVariant )arg1);
         
         PyThreadState* __tstate = wxPyBeginAllowThreads();
         result = wxCalendarCtrl::GetClassDefaultAttributes((wxWindowVariant )arg1);