Compatibility modules for a couple that have gone AWOL in the new namespace

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

diff --git a/wxPython/src/msw/windows_wrap.cpp b/wxPython/src/msw/windows_wrap.cpp
index c1b2575509ef36b1a752c074856c1be234a36c38..daae0f6af31350a7eacf8d9a542dedd60b23f8d1 100644 (file)
--- a/wxPython/src/msw/windows_wrap.cpp
+++ b/wxPython/src/msw/windows_wrap.cpp
@@ -593,7 +593,7 @@ IMP_PYCALLBACK_STRING_SIZET     (wxPyHtmlListBox, wxHtmlListBox, OnGetItemMarkup
 class wxTaskBarIcon : public wxEvtHandler
 {
 public:
-    wxTaskBarIcon()  { PyErr_SetNone(PyExc_NotImplementedError); }
+    wxTaskBarIcon()  { wxPyRaiseNotImplemented(); }
 };
  
 
@@ -601,7 +601,7 @@ class wxTaskBarIconEvent : public wxEvent
 {
 public:
     wxTaskBarIconEvent(wxEventType, wxTaskBarIcon *)
-        { PyErr_SetNone(PyExc_NotImplementedError); }
+        { wxPyRaiseNotImplemented(); }
     virtual wxEvent* Clone() const { return NULL; }
 };
 
@@ -10984,6 +10984,7 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO
     wxMultiChoiceDialog *result;
     bool temp2 = False ;
     bool temp3 = False ;
+    bool temp5 = False ;
     wxPoint temp7 ;
     PyObject * obj0 = 0 ;
     PyObject * obj1 = 0 ;
@@ -11006,7 +11007,11 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO
         if (arg3 == NULL) SWIG_fail;
         temp3 = True;
     }
-    if ((SWIG_ConvertPtr(obj4,(void **) &arg5, SWIGTYPE_p_wxString,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    {
+        arg5 = wxString_in_helper(obj4);
+        if (arg5 == NULL) SWIG_fail;
+        temp5 = True;
+    }
     if (obj6) {
         {
             arg7 = &temp7;
@@ -11029,6 +11034,10 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO
         if (temp3)
         delete arg3;
     }
+    {
+        if (temp5)
+        delete arg5;
+    }
     return resultobj;
     fail:
     {
@@ -11039,6 +11048,10 @@ static PyObject *_wrap_new_MultiChoiceDialog(PyObject *self, PyObject *args, PyO
         if (temp3)
         delete arg3;
     }
+    {
+        if (temp5)
+        delete arg5;
+    }
     return NULL;
 }