Forgot this part of the event change patch from 2_8

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

diff --git a/wxPython/src/_artprov.i b/wxPython/src/_artprov.i
index 8e10f6e9fd7fb3c480b422eae0e5ffd5db1155bd..0e7a2a44e431a8e6108efb0ad5fc15877dd7d564 100644 (file)
--- a/wxPython/src/_artprov.i
+++ b/wxPython/src/_artprov.i
@@ -31,6 +31,7 @@ MAKE_CONST_WXSTRING(ART_CMN_DIALOG);
 MAKE_CONST_WXSTRING(ART_HELP_BROWSER);
 MAKE_CONST_WXSTRING(ART_MESSAGE_BOX);
 MAKE_CONST_WXSTRING(ART_BUTTON);
+MAKE_CONST_WXSTRING(ART_LIST);
 MAKE_CONST_WXSTRING(ART_OTHER);
 
 // Art IDs
@@ -115,6 +116,30 @@ public:
         return rval;
     }
 
+    virtual wxIconBundle CreateIconBundle(const wxArtID& id,
+                                          const wxArtClient& client)
+    {
+        wxIconBundle rval = wxNullIconBundle;
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        if ((wxPyCBH_findCallback(m_myInst, "CreateIconBundle"))) {
+            PyObject* ro;
+            wxIconBundle* ptr;
+            PyObject* s1, *s2;
+            s1 = wx2PyString(id);
+            s2 = wx2PyString(client);
+            ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)", s1, s2));
+            Py_DECREF(s1);
+            Py_DECREF(s2);
+            if (ro) {
+                if (wxPyConvertSwigPtr(ro, (void**)&ptr, wxT("wxIconBundle")))
+                    rval = *ptr;
+                Py_DECREF(ro);
+            }
+        }
+        wxPyEndBlockThreads(blocked);
+        return rval;
+    }
+
     PYPRIVATE;
 };
 %}
@@ -237,13 +262,14 @@ identical bitmap for different client values!
 MustHaveApp(wxPyArtProvider);
 MustHaveApp(wxPyArtProvider::GetBitmap);
 MustHaveApp(wxPyArtProvider::GetIcon);
+MustHaveApp(wxPyArtProvider::GetBundle);
 
 %rename(ArtProvider) wxPyArtProvider;
 class wxPyArtProvider /*: public wxObject*/
 {
 public:
 
-    %pythonAppend wxPyArtProvider "self._setCallbackInfo(self, ArtProvider)"
+    %pythonAppend wxPyArtProvider setCallbackInfo(ArtProvider);
     wxPyArtProvider();
     ~wxPyArtProvider();
     
@@ -254,12 +280,12 @@ public:
     DocDeclStr(
         static void , Push(wxPyArtProvider *provider),
         "Add new provider to the top of providers stack.", "");
-    %pythoncode { PushProvider = wx._deprecated(Push, "See `Push`") }
+    %pythoncode { PushProvider = Push }
     
     DocDeclStr(
         static void , Insert(wxPyArtProvider *provider),
         "Add new provider to the bottom of providers stack.", "");
-    %pythoncode { InsertProvider = wx._deprecated(Insert, "See `Insert`") }
+    %pythoncode { InsertProvider = Insert }
 
     %cleardisown( wxPyArtProvider *provider );
     
@@ -267,14 +293,14 @@ public:
     DocDeclStr(
         static bool , Pop(),
         "Remove latest added provider and delete it.", "");
-    %pythoncode { PopProvider = wx._deprecated(Pop, "See `Pop`") }
+    %pythoncode { PopProvider = Pop }
     
     %pythonAppend Delete "args[1].thisown = 1";
     DocDeclStr(
         static bool , Delete(wxPyArtProvider *provider),
         "Remove provider. The provider must have been added previously!  The
 provider is _not_ deleted.", "");
-    %pythoncode { RemoveProvider = wx._deprecated(Delete, "See `Delete`") }
+    %pythoncode { RemoveProvider = Delete }
 
 
     DocDeclStr(
@@ -287,11 +313,18 @@ wx.NullBitmap if no provider provides it.", "");
 
     DocDeclStr(
         static wxIcon , GetIcon(const wxString& id,
-                          const wxString& client = wxPyART_OTHER,
+                                const wxString& client = wxPyART_OTHER,
                                 const wxSize& size = wxDefaultSize),
         "Query the providers for icon with given ID and return it.  Return
 wx.NullIcon if no provider provides it.", "");
 
+    DocDeclStr(
+        static wxIconBundle , GetIconBundle(const wxArtID& id,
+                                            const wxArtClient& client = wxART_OTHER),
+        "Query the providers for iconbundle with given ID and return it. Return
+wx.NullIconBundle if no provider provides it.", "");
+    
+    
     DocDeclStr(
         static wxSize , GetSizeHint(const wxString& client, bool platform_dependent = false),
         "Get the size hint of an icon from a specific Art Client, queries the
@@ -299,7 +332,7 @@ topmost provider if platform_dependent = false", "");
     
     
 
-    %pythonAppend Destroy "args[0].thisown = 0"
+    %pythonPrepend Destroy "args[0].this.own(False)"
     %extend { void Destroy() { delete self; }}
 };