Use the wx.ART_NORMAL_FILE icon

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

diff --git a/wxPython/src/msw/calendar_wrap.cpp b/wxPython/src/msw/calendar_wrap.cpp
index ec3c9640d45884d0e45cef4c7ad7b47e78ec107f..0afdad34fc2bd66b042ea848b8d2eedcc04f6d6e 100644 (file)
--- a/wxPython/src/msw/calendar_wrap.cpp
+++ b/wxPython/src/msw/calendar_wrap.cpp
@@ -1037,7 +1037,8 @@ SWIG_Python_TypeError(const char *type, PyObject *obj)
          PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
                       type, otype);
        }
-       Py_DECREF(str);
+       if (str)
+          Py_DECREF(str);
        return;
       }
     }   
@@ -1582,7 +1583,7 @@ static PyObject *wxCalendarCtrl_HitTest(wxCalendarCtrl *self,wxPoint const &pos)
             wxDateTime* date = new wxDateTime;
             wxDateTime::WeekDay wd;
             wxCalendarHitTestResult result = self->HitTest(pos, date, &wd);
-            bool blocked = wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(3);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(result));
             PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(date, wxT("wxDateTime"), 1));