fixed deadlock when calling wxPostEvent() from worker thread

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

diff --git a/wxPython/src/_artprov.i b/wxPython/src/_artprov.i
index 6a214f53636f52114394e5aa4d4a60c3710a9088..3213543a55e17d6985aad3bc19c5743979019bb0 100644 (file)
--- a/wxPython/src/_artprov.i
+++ b/wxPython/src/_artprov.i
@@ -131,7 +131,7 @@ asks wx.ArtProvider for it instead. This way the users can plug in
 their own wx.ArtProvider class and easily replace standard art with
 his/her own version. It is easy thing to do: all that is needed is
 to derive a class from wx.ArtProvider, override it's CreateBitmap
 their own wx.ArtProvider class and easily replace standard art with
 his/her own version. It is easy thing to do: all that is needed is
 to derive a class from wx.ArtProvider, override it's CreateBitmap

-method and register the provider with wx.ArtProvider.PushProvider::
+method and register the provider with `wx.ArtProvider.Push`::

 
     class MyArtProvider(wx.ArtProvider):
         def __init__(self):
 
     class MyArtProvider(wx.ArtProvider):
         def __init__(self):


@@ -148,7 +148,7 @@ Identifying art resources
 Every bitmap is known to wx.ArtProvider under an unique ID that is
 used when requesting a resource from it. The IDs can have one of the
 following predefined values.  Additionally, any string recognized by
 Every bitmap is known to wx.ArtProvider under an unique ID that is
 used when requesting a resource from it. The IDs can have one of the
 following predefined values.  Additionally, any string recognized by

-custom art providers registered using `PushProvider` may be used.
+custom art providers registered using `Push` may be used.

 
 GTK+ Note
 ---------
 
 GTK+ Note
 ---------


@@ -243,33 +243,39 @@ class wxPyArtProvider /*: public wxObject*/
 {
 public:
 
 {
 public:
 

-    %pythonAppend wxPyArtProvider "self._setCallbackInfo(self, ArtProvider)"
+    %pythonAppend wxPyArtProvider setCallbackInfo(ArtProvider);

     wxPyArtProvider();
     ~wxPyArtProvider();
     
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
     %disownarg( wxPyArtProvider *provider );
     wxPyArtProvider();
     ~wxPyArtProvider();
     
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
     %disownarg( wxPyArtProvider *provider );

+

     DocDeclStr(
     DocDeclStr(

-        static void , PushProvider(wxPyArtProvider *provider),
+        static void , Push(wxPyArtProvider *provider),

         "Add new provider to the top of providers stack.", "");
         "Add new provider to the top of providers stack.", "");

-
+    %pythoncode { PushProvider = Push }
+    

     DocDeclStr(
     DocDeclStr(

-        static void , InsertProvider(wxPyArtProvider *provider),
+        static void , Insert(wxPyArtProvider *provider),

         "Add new provider to the bottom of providers stack.", "");
         "Add new provider to the bottom of providers stack.", "");

+    %pythoncode { InsertProvider = Insert }
+

     %cleardisown( wxPyArtProvider *provider );
     
 
     DocDeclStr(
     %cleardisown( wxPyArtProvider *provider );
     
 
     DocDeclStr(

-        static bool , PopProvider(),
+        static bool , Pop(),

         "Remove latest added provider and delete it.", "");
         "Remove latest added provider and delete it.", "");

+    %pythoncode { PopProvider = Pop }

     
     

-    %pythonAppend RemoveProvider "args[1].thisown = 1";
+    %pythonAppend Delete "args[1].thisown = 1";

     DocDeclStr(
     DocDeclStr(

-        static bool , RemoveProvider(wxPyArtProvider *provider),
+        static bool , Delete(wxPyArtProvider *provider),

         "Remove provider. The provider must have been added previously!  The
 provider is _not_ deleted.", "");
         "Remove provider. The provider must have been added previously!  The
 provider is _not_ deleted.", "");

-    
+    %pythoncode { RemoveProvider = Delete }
+

 
     DocDeclStr(
         static wxBitmap , GetBitmap(const wxString& id,
 
     DocDeclStr(
         static wxBitmap , GetBitmap(const wxString& id,


@@ -293,7 +299,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; }}
 };
 
     %extend { void Destroy() { delete self; }}
 };