fixed a typo

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 31acadfa5ecacde7cb1b8a04cace9910908ff055..92c8fe6010456466e5dc2fbdc93d7e9232b9e0d1 100644 (file)
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -449,9 +449,9 @@ public:
             else
                 return NULL;
         }
-    }  // The OOR typemaps don't know what to do with the %new, so fix it up.
+    } // The OOR typemaps don't know what to do with the %new, so fix it up.
     %pragma(python) addtoclass = "
-    def GetItem(self, *_args, **_kwargs):
+    def GetColumn(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs)
         if val is not None: val.thisown = 1
         return val
@@ -492,7 +492,7 @@ public:
     %pragma(python) addtoclass = "
     def GetItem(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs)
-        val.thisown = 1
+        if val is not None: val.thisown = 1
         return val
     "
 

diff --git a/wxPython/src/msw/controls2.py b/wxPython/src/msw/controls2.py
index 4e0d8638e8f0a0d94b7bc22f9389035cf1b7f0b7..fe8aade9d1fff4da05291f280439e697b7c9a8e3 100644 (file)
--- a/wxPython/src/msw/controls2.py
+++ b/wxPython/src/msw/controls2.py
@@ -637,7 +637,7 @@ class wxListCtrlPtr(wxControlPtr):
     def __repr__(self):
         return "<C wxListCtrl instance at %s>" % (self.this,)
     
-    def GetItem(self, *_args, **_kwargs):
+    def GetColumn(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs)
         if val is not None: val.thisown = 1
         return val
@@ -645,7 +645,7 @@ class wxListCtrlPtr(wxControlPtr):
     
     def GetItem(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs)
-        val.thisown = 1
+        if val is not None: val.thisown = 1
         return val