Fixed DSM

[wxWidgets.git] / wxPython / src / controls2.i

diff --git a/wxPython/src/controls2.i b/wxPython/src/controls2.i
index 31acadfa5ecacde7cb1b8a04cace9910908ff055..37671c76bc7f04704aa69035dc47f2a9d707c7cb 100644 (file)
--- a/wxPython/src/controls2.i
+++ b/wxPython/src/controls2.i
@@ -358,7 +358,8 @@ public:
     wxListItem    m_item;
 %readwrite
 
     wxListItem    m_item;
 %readwrite
 

-    int GetCode();
+    int GetKeyCode();
+    %pragma(python) addtoclass = "GetCode = GetKeyCode"

     long GetIndex();
     int GetColumn();
     wxPoint GetPoint();
     long GetIndex();
     int GetColumn();
     wxPoint GetPoint();


@@ -444,14 +445,15 @@ public:
     %addmethods {
         %new wxListItem* GetColumn(int col) {
             wxListItem item;
     %addmethods {
         %new wxListItem* GetColumn(int col) {
             wxListItem item;

+            item.SetMask(0xFFFF);

             if (self->GetColumn(col, item))
                 return new wxListItem(item);
             else
                 return NULL;
         }
             if (self->GetColumn(col, item))
                 return new wxListItem(item);
             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 = "
     %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
         val = apply(controls2c.wxListCtrl_GetColumn,(self,) + _args, _kwargs)
         if val is not None: val.thisown = 1
         return val


@@ -492,7 +494,7 @@ public:
     %pragma(python) addtoclass = "
     def GetItem(self, *_args, **_kwargs):
         val = apply(controls2c.wxListCtrl_GetItem,(self,) + _args, _kwargs)
     %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
     "
 
         return val
     "
 


@@ -738,6 +740,17 @@ public:
             return self->SortItems(wxPyListCtrl_SortItems, (long)func);
         }
     }
             return self->SortItems(wxPyListCtrl_SortItems, (long)func);
         }
     }

+
+
+    %addmethods {
+        wxWindow* GetMainWindow() {
+        #ifdef __WXMSW__
+            return self;
+        #else
+            return (wxWindow*)self->m_mainWin;
+        #endif
+        }
+    }

 };
 
 
 };
 
 


@@ -1041,7 +1054,8 @@ public:
     wxTreeItemId GetOldItem();
     wxPoint GetPoint();
     const wxKeyEvent& GetKeyEvent();
     wxTreeItemId GetOldItem();
     wxPoint GetPoint();
     const wxKeyEvent& GetKeyEvent();

-    int GetCode();
+    int GetKeyCode();
+    %pragma(python) addtoclass = "GetCode = GetKeyCode"

     const wxString& GetLabel();
 };
 
     const wxString& GetLabel();
 };