diff --git a/wxPython/contrib/glcanvas/msw/glcanvas.py b/wxPython/contrib/glcanvas/msw/glcanvas.py
index 1df2c3191e..a7b7b8dd67 100644
--- a/wxPython/contrib/glcanvas/msw/glcanvas.py
+++ b/wxPython/contrib/glcanvas/msw/glcanvas.py
@@ -49,7 +49,10 @@ class wxGLContextPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=glcanvasc.delete_wxGLContext):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetCurrent(self, *_args, **_kwargs):
         val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/contrib/ogl/oglshapes.py b/wxPython/contrib/ogl/oglshapes.py
index 592d8b1874..4090867d08 100644
--- a/wxPython/contrib/ogl/oglshapes.py
+++ b/wxPython/contrib/ogl/oglshapes.py
@@ -51,7 +51,10 @@ class wxPseudoMetaFilePtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=oglshapesc.delete_wxPseudoMetaFile):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Draw(self, *_args, **_kwargs):
         val = apply(oglshapesc.wxPseudoMetaFile_Draw,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/contrib/ogl/oglshapes2.py b/wxPython/contrib/ogl/oglshapes2.py
index 53f3f2c45a..60d4c2947e 100644
--- a/wxPython/contrib/ogl/oglshapes2.py
+++ b/wxPython/contrib/ogl/oglshapes2.py
@@ -259,7 +259,10 @@ class wxArrowHeadPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=oglshapes2c.delete_wxArrowHead):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def _GetType(self, *_args, **_kwargs):
         val = apply(oglshapes2c.wxArrowHead__GetType,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/contrib/stc/msw/stc_.py b/wxPython/contrib/stc/msw/stc_.py
index 5b87064291..a3a4fef4a9 100644
--- a/wxPython/contrib/stc/msw/stc_.py
+++ b/wxPython/contrib/stc/msw/stc_.py
@@ -1048,7 +1048,10 @@ class wxStyledTextEventPtr(wxCommandEventPtr):
         self.thisown = 0
     def __del__(self, delfunc=stc_c.delete_wxStyledTextEvent):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetPosition(self, *_args, **_kwargs):
         val = apply(stc_c.wxStyledTextEvent_SetPosition,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/contrib/xrc/xrc.py b/wxPython/contrib/xrc/xrc.py
index 3d05cf1364..79f0b6a62c 100644
--- a/wxPython/contrib/xrc/xrc.py
+++ b/wxPython/contrib/xrc/xrc.py
@@ -58,7 +58,10 @@ class wxXmlResourcePtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=xrcc.delete_wxXmlResource):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Load(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlResource_Load,(self,) + _args, _kwargs)
         return val
@@ -212,7 +215,10 @@ class wxXmlNodePtr :
         self.thisown = 0
     def __del__(self, delfunc=xrcc.delete_wxXmlNode):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def AddChild(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlNode_AddChild,(self,) + _args, _kwargs)
         return val
@@ -304,7 +310,10 @@ class wxXmlDocumentPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=xrcc.delete_wxXmlDocument):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Load(self, *_args, **_kwargs):
         val = apply(xrcc.wxXmlDocument_Load,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/clip_dnd.py b/wxPython/src/msw/clip_dnd.py
index 2e618cd117..fd3400e661 100644
--- a/wxPython/src/msw/clip_dnd.py
+++ b/wxPython/src/msw/clip_dnd.py
@@ -13,7 +13,10 @@ class wxDataFormatPtr :
         self.thisown = 0
     def __del__(self, delfunc=clip_dndc.delete_wxDataFormat):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetType(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxDataFormat_SetType,(self,) + _args, _kwargs)
         return val
@@ -45,7 +48,10 @@ class wxDataObjectPtr :
         self.thisown = 0
     def __del__(self, delfunc=clip_dndc.delete_wxDataObject):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetPreferredFormat(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxDataObject_GetPreferredFormat,(self,) + _args, _kwargs)
         if val: val = wxDataFormatPtr(val) ; val.thisown = 1
@@ -355,7 +361,10 @@ class wxDropSourcePtr :
         return val
     def __del__(self, delfunc=clip_dndc.delete_wxDropSource):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetData(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxDropSource_SetData,(self,) + _args, _kwargs)
         return val
@@ -405,7 +414,10 @@ class wxPyDropTargetPtr(wxDropTargetPtr):
         return val
     def __del__(self, delfunc=clip_dndc.delete_wxPyDropTarget):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetDataObject(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxPyDropTarget_GetDataObject,(self,) + _args, _kwargs)
         if val: val = wxDataObjectPtr(val) 
diff --git a/wxPython/src/msw/cmndlgs.py b/wxPython/src/msw/cmndlgs.py
index e27245cf3b..9555d3bc82 100644
--- a/wxPython/src/msw/cmndlgs.py
+++ b/wxPython/src/msw/cmndlgs.py
@@ -43,7 +43,10 @@ class wxColourDataPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=cmndlgsc.delete_wxColourData):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetChooseFull(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxColourData_GetChooseFull,(self,) + _args, _kwargs)
         return val
@@ -273,7 +276,10 @@ class wxFontDataPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=cmndlgsc.delete_wxFontData):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def EnableEffects(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFontData_EnableEffects,(self,) + _args, _kwargs)
         return val
@@ -429,7 +435,10 @@ class wxFindReplaceDataPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=cmndlgsc.delete_wxFindReplaceData):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetFindString(self, *_args, **_kwargs):
         val = apply(cmndlgsc.wxFindReplaceData_GetFindString,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/controls.py b/wxPython/src/msw/controls.py
index bbe5e3b41b..e314b93451 100644
--- a/wxPython/src/msw/controls.py
+++ b/wxPython/src/msw/controls.py
@@ -574,7 +574,10 @@ class wxTextAttrPtr :
         self.thisown = 0
     def __del__(self, delfunc=controlsc.delete_wxTextAttr):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetTextColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/controls2.py b/wxPython/src/msw/controls2.py
index c2605387b9..ff7d2087ff 100644
--- a/wxPython/src/msw/controls2.py
+++ b/wxPython/src/msw/controls2.py
@@ -188,7 +188,10 @@ class wxListItemPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=controls2c.delete_wxListItem):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Clear(self, *_args, **_kwargs):
         val = apply(controls2c.wxListItem_Clear,(self,) + _args, _kwargs)
         return val
@@ -819,7 +822,10 @@ class wxTreeItemIdPtr :
         self.thisown = 0
     def __del__(self, delfunc=controls2c.delete_wxTreeItemId):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def IsOk(self, *_args, **_kwargs):
         val = apply(controls2c.wxTreeItemId_IsOk,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/events.py b/wxPython/src/msw/events.py
index dab6d0735c..9ec900d64f 100644
--- a/wxPython/src/msw/events.py
+++ b/wxPython/src/msw/events.py
@@ -12,7 +12,10 @@ class wxEventPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=eventsc.delete_wxEvent):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetEventObject(self, *_args, **_kwargs):
         val = apply(eventsc.wxEvent_GetEventObject,(self,) + _args, _kwargs)
         return val
@@ -1097,7 +1100,10 @@ class wxPyEventPtr(wxEventPtr):
         self.thisown = 0
     def __del__(self, delfunc=eventsc.delete_wxPyEvent):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetSelf(self, *_args, **_kwargs):
         val = apply(eventsc.wxPyEvent_SetSelf,(self,) + _args, _kwargs)
         return val
@@ -1121,7 +1127,10 @@ class wxPyCommandEventPtr(wxCommandEventPtr):
         self.thisown = 0
     def __del__(self, delfunc=eventsc.delete_wxPyCommandEvent):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetSelf(self, *_args, **_kwargs):
         val = apply(eventsc.wxPyCommandEvent_SetSelf,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/fonts.py b/wxPython/src/msw/fonts.py
index 975ea7fd4b..4f2f474f91 100644
--- a/wxPython/src/msw/fonts.py
+++ b/wxPython/src/msw/fonts.py
@@ -82,7 +82,10 @@ class wxFontMapperPtr :
         self.thisown = 0
     def __del__(self, delfunc=fontsc.delete_wxFontMapper):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetAltForEncoding(self, *_args, **_kwargs):
         val = apply(fontsc.wxFontMapper_GetAltForEncoding,(self,) + _args, _kwargs)
         return val
@@ -124,7 +127,10 @@ class wxFontPtr(wxObjectPtr):
         return val
     def __del__(self, delfunc=fontsc.delete_wxFont):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Ok(self, *_args, **_kwargs):
         val = apply(fontsc.wxFont_Ok,(self,) + _args, _kwargs)
         return val
@@ -251,7 +257,10 @@ class wxFontEnumeratorPtr :
         self.thisown = 0
     def __del__(self, delfunc=fontsc.delete_wxFontEnumerator):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def _setCallbackInfo(self, *_args, **_kwargs):
         val = apply(fontsc.wxFontEnumerator__setCallbackInfo,(self,) + _args, _kwargs)
         return val
@@ -316,7 +325,10 @@ class wxLocalePtr :
         self.thisown = 0
     def __del__(self, delfunc=fontsc.delete_wxLocale):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Init1(self, *_args, **_kwargs):
         val = apply(fontsc.wxLocale_Init1,(self,) + _args, _kwargs)
         return val
@@ -374,7 +386,10 @@ class wxEncodingConverterPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=fontsc.delete_wxEncodingConverter):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Init(self, *_args, **_kwargs):
         val = apply(fontsc.wxEncodingConverter_Init,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py
index 7340580fcd..5f624b2a89 100644
--- a/wxPython/src/msw/gdi.py
+++ b/wxPython/src/msw/gdi.py
@@ -11,7 +11,10 @@ class wxGDIObjectPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxGDIObject):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetVisible(self, *_args, **_kwargs):
         val = apply(gdic.wxGDIObject_GetVisible,(self,) + _args, _kwargs)
         return val
@@ -37,7 +40,10 @@ class wxBitmapPtr(wxGDIObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxBitmap):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetPalette(self, *_args, **_kwargs):
         val = apply(gdic.wxBitmap_GetPalette,(self,) + _args, _kwargs)
         if val: val = wxPalettePtr(val) 
@@ -142,7 +148,10 @@ class wxIconPtr(wxGDIObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxIcon):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def LoadFile(self, *_args, **_kwargs):
         val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs)
         return val
@@ -195,7 +204,10 @@ class wxIconBundlePtr :
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxIconBundle):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def AddIcon(self, *_args, **_kwargs):
         val = apply(gdic.wxIconBundle_AddIcon,(self,) + _args, _kwargs)
         return val
@@ -232,7 +244,10 @@ class wxCursorPtr(wxGDIObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxCursor):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetHandle(self, *_args, **_kwargs):
         val = apply(gdic.wxCursor_GetHandle,(self,) + _args, _kwargs)
         return val
@@ -279,7 +294,10 @@ class wxColourPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxColour):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Red(self, *_args, **_kwargs):
         val = apply(gdic.wxColour_Red,(self,) + _args, _kwargs)
         return val
@@ -351,7 +369,10 @@ class wxPenPtr(wxGDIObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxPen):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetCap(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_GetCap,(self,) + _args, _kwargs)
         return val
@@ -415,7 +436,10 @@ class wxPyPenPtr(wxPenPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxPyPen):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetDashes(self, *_args, **_kwargs):
         val = apply(gdic.wxPyPen_SetDashes,(self,) + _args, _kwargs)
         return val
@@ -461,7 +485,10 @@ class wxBrushPtr(wxGDIObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxBrush):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetColour(self, *_args, **_kwargs):
         val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs)
         if val: val = wxColourPtr(val) ; val.thisown = 1
@@ -527,7 +554,10 @@ class wxDCPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxDC):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def BeginDrawing(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_BeginDrawing,(self,) + _args, _kwargs)
         return val
@@ -1064,7 +1094,10 @@ class wxMetaFilePtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxMetaFile):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Ok(self, *_args, **_kwargs):
         val = apply(gdic.wxMetaFile_Ok,(self,) + _args, _kwargs)
         return val
@@ -1118,7 +1151,10 @@ class wxPalettePtr(wxGDIObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxPalette):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetPixel(self, *_args, **_kwargs):
         val = apply(gdic.wxPalette_GetPixel,(self,) + _args, _kwargs)
         return val
@@ -1144,7 +1180,10 @@ class wxImageListPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxImageList):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Add(self, *_args, **_kwargs):
         val = apply(gdic.wxImageList_Add,(self,) + _args, _kwargs)
         return val
@@ -1188,7 +1227,10 @@ class wxRegionPtr(wxGDIObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxRegion):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Clear(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs)
         return val
@@ -1271,7 +1313,10 @@ class wxRegionIteratorPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=gdic.delete_wxRegionIterator):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetX(self, *_args, **_kwargs):
         val = apply(gdic.wxRegionIterator_GetX,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/grid.cpp b/wxPython/src/msw/grid.cpp
index 476d939df7..9a3d6a3252 100644
--- a/wxPython/src/msw/grid.cpp
+++ b/wxPython/src/msw/grid.cpp
@@ -12728,6 +12728,94 @@ static PyObject *_wrap_wxGrid_GetSelectedCols(PyObject *self, PyObject *args, Py
     return _resultobj;
 }
 
+#define wxGrid_DeselectRow(_swigobj,_swigarg0)  (_swigobj->DeselectRow(_swigarg0))
+static PyObject *_wrap_wxGrid_DeselectRow(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGrid * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_DeselectRow",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_DeselectRow. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxGrid_DeselectRow(_arg0,_arg1);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxGrid_DeselectCol(_swigobj,_swigarg0)  (_swigobj->DeselectCol(_swigarg0))
+static PyObject *_wrap_wxGrid_DeselectCol(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGrid * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","col", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_DeselectCol",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_DeselectCol. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxGrid_DeselectCol(_arg0,_arg1);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxGrid_DeselectCell(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DeselectCell(_swigarg0,_swigarg1))
+static PyObject *_wrap_wxGrid_DeselectCell(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGrid * _arg0;
+    int  _arg1;
+    int  _arg2;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row","col", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_DeselectCell",_kwnames,&_argo0,&_arg1,&_arg2)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_DeselectCell. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxGrid_DeselectCell(_arg0,_arg1,_arg2);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxGrid_BlockToDeviceRect(_swigobj,_swigarg0,_swigarg1)  (_swigobj->BlockToDeviceRect(_swigarg0,_swigarg1))
 static PyObject *_wrap_wxGrid_BlockToDeviceRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -14525,6 +14613,9 @@ static PyMethodDef gridcMethods[] = {
 	 { "wxGrid_GetSelectionForeground", (PyCFunction) _wrap_wxGrid_GetSelectionForeground, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_GetSelectionBackground", (PyCFunction) _wrap_wxGrid_GetSelectionBackground, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_BlockToDeviceRect", (PyCFunction) _wrap_wxGrid_BlockToDeviceRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_DeselectCell", (PyCFunction) _wrap_wxGrid_DeselectCell, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_DeselectCol", (PyCFunction) _wrap_wxGrid_DeselectCol, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_DeselectRow", (PyCFunction) _wrap_wxGrid_DeselectRow, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_GetSelectedCols", (PyCFunction) _wrap_wxGrid_GetSelectedCols, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_GetSelectedRows", (PyCFunction) _wrap_wxGrid_GetSelectedRows, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_GetSelectionBlockBottomRight", (PyCFunction) _wrap_wxGrid_GetSelectionBlockBottomRight, METH_VARARGS | METH_KEYWORDS },
diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py
index cadcd8383e..760f902e4b 100644
--- a/wxPython/src/msw/grid.py
+++ b/wxPython/src/msw/grid.py
@@ -873,7 +873,10 @@ class wxGridTableMessagePtr :
         self.thisown = 0
     def __del__(self, delfunc=gridc.delete_wxGridTableMessage):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetTableObject(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableMessage_SetTableObject,(self,) + _args, _kwargs)
         return val
@@ -914,7 +917,10 @@ class wxGridCellCoordsPtr :
         self.thisown = 0
     def __del__(self, delfunc=gridc.delete_wxGridCellCoords):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetRow(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellCoords_GetRow,(self,) + _args, _kwargs)
         return val
@@ -1462,6 +1468,15 @@ class wxGridPtr(wxScrolledWindowPtr):
     def GetSelectedCols(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetSelectedCols,(self,) + _args, _kwargs)
         return val
+    def DeselectRow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_DeselectRow,(self,) + _args, _kwargs)
+        return val
+    def DeselectCol(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_DeselectCol,(self,) + _args, _kwargs)
+        return val
+    def DeselectCell(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_DeselectCell,(self,) + _args, _kwargs)
+        return val
     def BlockToDeviceRect(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_BlockToDeviceRect,(self,) + _args, _kwargs)
         if val: val = wxRectPtr(val) ; val.thisown = 1
diff --git a/wxPython/src/msw/help.py b/wxPython/src/msw/help.py
index d38b2d86de..ac1612ba19 100644
--- a/wxPython/src/msw/help.py
+++ b/wxPython/src/msw/help.py
@@ -67,7 +67,10 @@ class wxContextHelpPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=helpc.delete_wxContextHelp):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def BeginContextHelp(self, *_args, **_kwargs):
         val = apply(helpc.wxContextHelp_BeginContextHelp,(self,) + _args, _kwargs)
         return val
@@ -171,3 +174,4 @@ wxEVT_DETAILED_HELP = helpc.wxEVT_DETAILED_HELP
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx
 wx.wxHelpEventPtr         = wxHelpEventPtr
+wx.wxContextHelpButtonPtr = wxContextHelpButtonPtr
diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index fe4ef7fecc..8766b132a2 100644
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -651,7 +651,10 @@ class wxHtmlDCRendererPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=htmlc.delete_wxHtmlDCRenderer):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetDC(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlDCRenderer_SetDC,(self,) + _args, _kwargs)
         return val
@@ -712,7 +715,10 @@ class wxHtmlEasyPrintingPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=htmlc.delete_wxHtmlEasyPrinting):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def PreviewFile(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlEasyPrinting_PreviewFile,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/htmlhelp.py b/wxPython/src/msw/htmlhelp.py
index 4c88c542b5..33fdd1e5df 100644
--- a/wxPython/src/msw/htmlhelp.py
+++ b/wxPython/src/msw/htmlhelp.py
@@ -156,7 +156,10 @@ class wxHtmlHelpDataPtr :
         self.thisown = 0
     def __del__(self, delfunc=htmlhelpc.delete_wxHtmlHelpData):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetTempDir(self, *_args, **_kwargs):
         val = apply(htmlhelpc.wxHtmlHelpData_SetTempDir,(self,) + _args, _kwargs)
         return val
@@ -248,7 +251,10 @@ class wxHtmlHelpControllerPtr(wxEvtHandlerPtr):
         self.thisown = 0
     def __del__(self, delfunc=htmlhelpc.delete_wxHtmlHelpController):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetTitleFormat(self, *_args, **_kwargs):
         val = apply(htmlhelpc.wxHtmlHelpController_SetTitleFormat,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/image.py b/wxPython/src/msw/image.py
index 719c840bc0..d19383f178 100644
--- a/wxPython/src/msw/image.py
+++ b/wxPython/src/msw/image.py
@@ -194,7 +194,10 @@ class wxImagePtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=imagec.delete_wxImage):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Create(self, *_args, **_kwargs):
         val = apply(imagec.wxImage_Create,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/misc.py b/wxPython/src/msw/misc.py
index c6b51ca9d3..cb8cd13413 100644
--- a/wxPython/src/msw/misc.py
+++ b/wxPython/src/msw/misc.py
@@ -25,7 +25,10 @@ class wxSizePtr :
         self.thisown = 0
     def __del__(self, delfunc=miscc.delete_wxSize):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Set(self, *_args, **_kwargs):
         val = apply(miscc.wxSize_Set,(self,) + _args, _kwargs)
         return val
@@ -110,7 +113,10 @@ class wxRealPointPtr :
         self.thisown = 0
     def __del__(self, delfunc=miscc.delete_wxRealPoint):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Set(self, *_args, **_kwargs):
         val = apply(miscc.wxRealPoint_Set,(self,) + _args, _kwargs)
         return val
@@ -175,7 +181,10 @@ class wxPointPtr :
         self.thisown = 0
     def __del__(self, delfunc=miscc.delete_wxPoint):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Set(self, *_args, **_kwargs):
         val = apply(miscc.wxPoint_Set,(self,) + _args, _kwargs)
         return val
@@ -240,7 +249,10 @@ class wxRectPtr :
         self.thisown = 0
     def __del__(self, delfunc=miscc.delete_wxRect):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetX(self, *_args, **_kwargs):
         val = apply(miscc.wxRect_GetX,(self,) + _args, _kwargs)
         return val
@@ -665,7 +677,10 @@ class wxAcceleratorEntryPtr :
         self.thisown = 0
     def __del__(self, delfunc=miscc.delete_wxAcceleratorEntry):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Set(self, *_args, **_kwargs):
         val = apply(miscc.wxAcceleratorEntry_Set,(self,) + _args, _kwargs)
         return val
@@ -694,7 +709,10 @@ class wxAcceleratorTablePtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=miscc.delete_wxAcceleratorTable):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxAcceleratorTable instance at %s>" % (self.this,)
 class wxAcceleratorTable(wxAcceleratorTablePtr):
@@ -711,7 +729,10 @@ class wxBusyInfoPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=miscc.delete_wxBusyInfo):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxBusyInfo instance at %s>" % (self.this,)
 class wxBusyInfo(wxBusyInfoPtr):
diff --git a/wxPython/src/msw/misc2.py b/wxPython/src/msw/misc2.py
index 73131affbc..bffe2fddd4 100644
--- a/wxPython/src/msw/misc2.py
+++ b/wxPython/src/msw/misc2.py
@@ -100,7 +100,10 @@ class wxCaretPtr :
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxCaret):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def IsOk(self, *_args, **_kwargs):
         val = apply(misc2c.wxCaret_IsOk,(self,) + _args, _kwargs)
         return val
@@ -158,7 +161,10 @@ class wxBusyCursorPtr :
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxBusyCursor):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxBusyCursor instance at %s>" % (self.this,)
 class wxBusyCursor(wxBusyCursorPtr):
@@ -175,7 +181,10 @@ class wxWindowDisablerPtr :
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxWindowDisabler):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxWindowDisabler instance at %s>" % (self.this,)
 class wxWindowDisabler(wxWindowDisablerPtr):
@@ -192,7 +201,10 @@ class wxMutexGuiLockerPtr :
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxMutexGuiLocker):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxMutexGuiLocker instance at %s>" % (self.this,)
 class wxMutexGuiLocker(wxMutexGuiLockerPtr):
@@ -209,7 +221,10 @@ class wxTipProviderPtr :
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxTipProvider):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetTip(self, *_args, **_kwargs):
         val = apply(misc2c.wxTipProvider_GetTip,(self,) + _args, _kwargs)
         return val
@@ -252,7 +267,10 @@ class wxDragImagePtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxDragImage):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetBackingBitmap(self, *_args, **_kwargs):
         val = apply(misc2c.wxDragImage_SetBackingBitmap,(self,) + _args, _kwargs)
         return val
@@ -318,7 +336,10 @@ class wxPyTimerPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxPyTimer):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetInterval(self, *_args, **_kwargs):
         val = apply(misc2c.wxPyTimer_GetInterval,(self,) + _args, _kwargs)
         return val
@@ -353,7 +374,10 @@ class wxStopWatchPtr :
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxStopWatch):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Start(self, *_args, **_kwargs):
         val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs)
         return val
@@ -507,7 +531,10 @@ class wxLogNullPtr :
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxLogNull):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxLogNull instance at %s>" % (self.this,)
 class wxLogNull(wxLogNullPtr):
@@ -634,7 +661,10 @@ class wxJoystickPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxJoystick):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetPosition(self, *_args, **_kwargs):
         val = apply(misc2c.wxJoystick_GetPosition,(self,) + _args, _kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
@@ -778,7 +808,10 @@ class wxWavePtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxWave):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def IsOk(self, *_args, **_kwargs):
         val = apply(misc2c.wxWave_IsOk,(self,) + _args, _kwargs)
         return val
@@ -898,7 +931,10 @@ class wxFileTypePtr :
         return val
     def __del__(self, delfunc=misc2c.delete_wxFileType):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxFileType instance at %s>" % (self.this,)
 class wxFileType(wxFileTypePtr):
@@ -948,7 +984,10 @@ class wxMimeTypesManagerPtr :
         return val
     def __del__(self, delfunc=misc2c.delete_wxMimeTypesManager):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxMimeTypesManager instance at %s>" % (self.this,)
 class wxMimeTypesManager(wxMimeTypesManagerPtr):
@@ -983,7 +1022,10 @@ class wxFileHistoryPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxFileHistory):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def AddFileToHistory(self, *_args, **_kwargs):
         val = apply(misc2c.wxFileHistory_AddFileToHistory,(self,) + _args, _kwargs)
         return val
@@ -1094,7 +1136,10 @@ class wxSingleInstanceCheckerPtr :
         self.thisown = 0
     def __del__(self, delfunc=misc2c.delete_wxSingleInstanceChecker):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Create(self, *_args, **_kwargs):
         val = apply(misc2c.wxSingleInstanceChecker_Create,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/printfw.py b/wxPython/src/msw/printfw.py
index bd19dca69f..ba11c95428 100644
--- a/wxPython/src/msw/printfw.py
+++ b/wxPython/src/msw/printfw.py
@@ -27,7 +27,10 @@ class wxPrintDataPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=printfwc.delete_wxPrintData):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetNoCopies(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintData_GetNoCopies,(self,) + _args, _kwargs)
         return val
@@ -208,7 +211,10 @@ class wxPageSetupDialogDataPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=printfwc.delete_wxPageSetupDialogData):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def EnableHelp(self, *_args, **_kwargs):
         val = apply(printfwc.wxPageSetupDialogData_EnableHelp,(self,) + _args, _kwargs)
         return val
@@ -340,7 +346,10 @@ class wxPrintDialogDataPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=printfwc.delete_wxPrintDialogData):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def EnableHelp(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintDialogData_EnableHelp,(self,) + _args, _kwargs)
         return val
@@ -512,7 +521,10 @@ class wxPrinterPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=printfwc.delete_wxPrinter):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def CreateAbortWindow(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrinter_CreateAbortWindow,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/utils.py b/wxPython/src/msw/utils.py
index 2d0bb90d84..98fb73308a 100644
--- a/wxPython/src/msw/utils.py
+++ b/wxPython/src/msw/utils.py
@@ -12,7 +12,10 @@ class wxConfigBasePtr :
         self.thisown = 0
     def __del__(self, delfunc=utilsc.delete_wxConfigBase):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def DeleteAll(self, *_args, **_kwargs):
         val = apply(utilsc.wxConfigBase_DeleteAll,(self,) + _args, _kwargs)
         return val
@@ -139,7 +142,10 @@ class wxConfigPtr(wxConfigBasePtr):
         self.thisown = 0
     def __del__(self, delfunc=utilsc.delete_wxConfig):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxConfig instance at %s>" % (self.this,)
 class wxConfig(wxConfigPtr):
@@ -156,7 +162,10 @@ class wxFileConfigPtr(wxConfigBasePtr):
         self.thisown = 0
     def __del__(self, delfunc=utilsc.delete_wxFileConfig):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def __repr__(self):
         return "<C wxFileConfig instance at %s>" % (self.this,)
 class wxFileConfig(wxFileConfigPtr):
@@ -264,7 +273,10 @@ class wxDateTimePtr :
         self.thisown = 0
     def __del__(self, delfunc=utilsc.delete_wxDateTime):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetToCurrent(self, *_args, **_kwargs):
         val = apply(utilsc.wxDateTime_SetToCurrent,(self,) + _args, _kwargs)
         if val: val = wxDateTimePtr(val) 
@@ -605,7 +617,10 @@ class wxTimeSpanPtr :
         self.thisown = 0
     def __del__(self, delfunc=utilsc.delete_wxTimeSpan):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def Add(self, *_args, **_kwargs):
         val = apply(utilsc.wxTimeSpan_Add,(self,) + _args, _kwargs)
         if val: val = wxTimeSpanPtr(val) 
@@ -704,7 +719,10 @@ class wxDateSpanPtr :
         self.thisown = 0
     def __del__(self, delfunc=utilsc.delete_wxDateSpan):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetYears(self, *_args, **_kwargs):
         val = apply(utilsc.wxDateSpan_SetYears,(self,) + _args, _kwargs)
         if val: val = wxDateSpanPtr(val) 
diff --git a/wxPython/src/msw/windows2.py b/wxPython/src/msw/windows2.py
index 58499b1d6a..b263d3c4c7 100644
--- a/wxPython/src/msw/windows2.py
+++ b/wxPython/src/msw/windows2.py
@@ -251,7 +251,10 @@ class wxTaskBarIconPtr(wxEvtHandlerPtr):
         self.thisown = 0
     def __del__(self, delfunc=windows2c.delete_wxTaskBarIcon):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetIcon(self, *_args, **_kwargs):
         val = apply(windows2c.wxTaskBarIcon_SetIcon,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/windows3.py b/wxPython/src/msw/windows3.py
index d9b569c75a..c7a571f564 100644
--- a/wxPython/src/msw/windows3.py
+++ b/wxPython/src/msw/windows3.py
@@ -248,7 +248,10 @@ class wxLayoutAlgorithmPtr(wxObjectPtr):
         self.thisown = 0
     def __del__(self, delfunc=windows3c.delete_wxLayoutAlgorithm):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def LayoutMDIFrame(self, *_args, **_kwargs):
         val = apply(windows3c.wxLayoutAlgorithm_LayoutMDIFrame,(self,) + _args, _kwargs)
         return val
diff --git a/wxPython/src/msw/wizard.py b/wxPython/src/msw/wizard.py
index 334f6e3e1e..845cdb939f 100644
--- a/wxPython/src/msw/wizard.py
+++ b/wxPython/src/msw/wizard.py
@@ -275,3 +275,7 @@ wxEVT_WIZARD_FINISHED = wizardc.wxEVT_WIZARD_FINISHED
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx
 wx.wxWizardEventPtr         = wxWizardEventPtr
+wx.wxWizardPagePtr          = wxWizardPagePtr
+wx.wxPyWizardPagePtr        = wxPyWizardPagePtr
+wx.wxWizardPageSimplePtr    = wxWizardPageSimplePtr
+wx.wxWizardPtr              = wxWizardPtr
diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index e832cb524e..3b54f8c50b 100644
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -48,7 +48,10 @@ class wxPyAppPtr(wxEvtHandlerPtr):
         self.thisown = 0
     def __del__(self, delfunc=wxc.delete_wxPyApp):
         if self.thisown == 1:
-            delfunc(self)
+            try:
+                delfunc(self)
+            except:
+                pass
     def _setCallbackInfo(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp__setCallbackInfo,(self,) + _args, _kwargs)
         return val
@@ -1598,6 +1601,12 @@ if wxPlatform == "__WXGTK__":
     except:
         pass
 
+if wxPlatform == "__WXMSW__":
+    import os
+    localedir = os.path.join(os.path.split(__file__)[0], "locale")
+    wxLocale_AddCatalogLookupPathPrefix(localedir)
+    del os
+
 #----------------------------------------------------------------------
 # wxWindows version numbers.  wxPython version is in __version__.
 
diff --git a/wxPython/wxPython/.cvsignore b/wxPython/wxPython/.cvsignore
index d342ce52e3..157b98a798 100644
--- a/wxPython/wxPython/.cvsignore
+++ b/wxPython/wxPython/.cvsignore
@@ -2,4 +2,5 @@
 *.pyc
 *.pyd
 .DS_Store
+locale
 wxc.pyd.manifest