Don't confuse SWIG with static and non-static methods of the same name

[wxWidgets.git] / wxPython / contrib / gizmos / gizmos.i

diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i
index 925d17bff83b7a23c27cfb023d342d1d666c3fe8..0c272612c7e1e65948e66f7271eaae22c57d10b0 100644 (file)
--- a/wxPython/contrib/gizmos/gizmos.i
+++ b/wxPython/contrib/gizmos/gizmos.i
@@ -48,13 +48,10 @@
 MAKE_CONST_WXSTRING2(DynamicSashNameStr,     wxT("dynamicSashWindow"));
 MAKE_CONST_WXSTRING2(EditableListBoxNameStr, wxT("editableListBox"));
 MAKE_CONST_WXSTRING2(TreeListCtrlNameStr,    wxT("treelistctrl"));
-MAKE_CONST_WXSTRING(StaticPictureNameStr);
+MAKE_CONST_WXSTRING(StaticPictureNameStr);                     
     
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
-
-%include _gizmos_rename.i
-
 //---------------------------------------------------------------------------
 
 enum {
@@ -461,6 +458,8 @@ public:
                          bool shown = true,
                         wxTreeListColumnAlign alignment = wxTL_ALIGN_LEFT);
 
+    ~wxTreeListColumnInfo();
+    
     bool GetShown() const;
     wxTreeListColumnAlign GetAlignment() const;
     wxString GetText() const;
@@ -582,11 +581,11 @@ public:
     void SetStateImageList(wxImageList *imageList);
     void SetButtonsImageList(wxImageList *imageList);
 
-    %apply SWIGTYPE *DISOWN { wxImageList *imageList };
+    %disownarg( wxImageList *imageList );
     void AssignImageList(wxImageList *imageList);
     void AssignStateImageList(wxImageList *imageList);
     void AssignButtonsImageList(wxImageList *imageList);
-    %clear wxImageList *imageList;
+    %cleardisown( wxImageList *imageList );
 
 
     // adds a column
@@ -671,10 +670,12 @@ public:
             return data;
         }
 
+        %disownarg( wxPyTreeItemData* data );
         void SetItemData(const wxTreeItemId& item, wxPyTreeItemData* data) {
             data->SetId(item); // set the id
             self->SetItemData(item, data);
         }
+        %cleardisown(wxPyTreeItemData* data );
 
         // [Get|Set]ItemPyData are short-cuts.  Also made somewhat crash-proof by
         // automatically creating data classes.
@@ -768,6 +769,7 @@ public:
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
                 PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true);
                 PyList_Append(rval, item);
+                Py_DECREF(item);
             }
             wxPyEndBlockThreads(blocked);
             return rval;
@@ -846,6 +848,8 @@ public:
     wxTreeItemId GetNext(const wxTreeItemId& item) const;
 
 
+    %disownarg( wxPyTreeItemData* data );
+    
     // add the root node to the tree
     wxTreeItemId AddRoot(const wxString& text,
                          int image = -1, int selectedImage = -1,
@@ -878,6 +882,8 @@ public:
                             int image = -1, int selectedImage = -1,
                             wxPyTreeItemData *data = NULL);
 
+    %cleardisown(wxPyTreeItemData* data );
+    
     // delete this item and associated data if any
     void Delete(const wxTreeItemId& item);
 
@@ -977,8 +983,8 @@ public:
     %pythonAppend wxStaticPicture         "self._setOORInfo(self)"
     %pythonAppend wxStaticPicture()       ""
 
-    wxStaticPicture( wxWindow* parent, wxWindowID id,
-                     const wxBitmap& label,
+    wxStaticPicture( wxWindow* parent, wxWindowID id=-1,
+                     const wxBitmap& label=wxNullBitmap,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = 0,
@@ -986,8 +992,8 @@ public:
 
     %RenameCtor(PreStaticPicture, wxStaticPicture());
 
-    bool Create( wxWindow* parent, wxWindowID id,
-                 const wxBitmap& label,
+    bool Create( wxWindow* parent, wxWindowID id=-1,
+                 const wxBitmap& label=wxNullBitmap,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,