memory dc must have bitmap selected into it before it can be used for measuring

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

diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i
index 71dccd36c63239672e262756b5cb00d86e692e67..0c272612c7e1e65948e66f7271eaae22c57d10b0 100644 (file)
--- a/wxPython/contrib/gizmos/gizmos.i
+++ b/wxPython/contrib/gizmos/gizmos.i
@@ -52,9 +52,6 @@ MAKE_CONST_WXSTRING(StaticPictureNameStr);
     
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
     
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 

-
-%include _gizmos_rename.i
-

 //---------------------------------------------------------------------------
 
 enum {
 //---------------------------------------------------------------------------
 
 enum {


@@ -461,6 +458,8 @@ public:
                          bool shown = true,
                         wxTreeListColumnAlign alignment = wxTL_ALIGN_LEFT);
 
                          bool shown = true,
                         wxTreeListColumnAlign alignment = wxTL_ALIGN_LEFT);
 

+    ~wxTreeListColumnInfo();
+    

     bool GetShown() const;
     wxTreeListColumnAlign GetAlignment() const;
     wxString GetText() const;
     bool GetShown() const;
     wxTreeListColumnAlign GetAlignment() const;
     wxString GetText() const;


@@ -671,10 +670,12 @@ public:
             return data;
         }
 
             return data;
         }
 

+        %disownarg( wxPyTreeItemData* data );

         void SetItemData(const wxTreeItemId& item, wxPyTreeItemData* data) {
             data->SetId(item); // set the id
             self->SetItemData(item, 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.
 
         // [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);
                 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;
             }
             wxPyEndBlockThreads(blocked);
             return rval;


@@ -846,6 +848,8 @@ public:
     wxTreeItemId GetNext(const wxTreeItemId& item) const;
 
 
     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,
     // 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);
 
                             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);
 
     // delete this item and associated data if any
     void Delete(const wxTreeItemId& item);