X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a72f4631fe5ab7ebeefdacf8ec9c826ea962133f..300b44a9336a9610fef256afb412e8fb6b51840f:/wxPython/src/_clipbrd.i

diff --git a/wxPython/src/_clipbrd.i b/wxPython/src/_clipbrd.i
index 1c262b3888..546fe5087f 100644
--- a/wxPython/src/_clipbrd.i
+++ b/wxPython/src/_clipbrd.i
@@ -65,7 +65,7 @@ True on success.", "");
     
 
 
-    %apply SWIGTYPE *DISOWN { wxDataObject *data };
+    %disownarg( wxDataObject *data );
     
     DocDeclStr(
         virtual bool , AddData( wxDataObject *data ),
@@ -84,8 +84,8 @@ do not delete the data explicitly.
 
 :see: `wx.DataObject`", "");
     
-
-    %clear wxDataObject *data;
+    %cleardisown( wxDataObject *data );
+    
     
     DocDeclStr(
         virtual bool , IsSupported( const wxDataFormat& format ),
@@ -114,15 +114,23 @@ exit.  Returns False if the operation is unsuccesful for any reason.", "");
 
     DocDeclStr(
         virtual void , UsePrimarySelection( bool primary = true ),
-        "On platforms supporting it (the X11 based platforms), selects the
-so called PRIMARY SELECTION as the clipboard as opposed to the
-normal clipboard, if primary is True.", "");
+        "On platforms supporting it (the X11 based platforms), selects the so
+called PRIMARY SELECTION as the clipboard as opposed to the normal
+clipboard, if primary is True.  On other platforms all clipboard
+operations fail when using the primary selection.  This allows code
+supporting the primary selection to be written without ill effects on
+the other platforms.", "");
 
+    
+    DocDeclStr(
+        bool , IsUsingPrimarySelection() const,
+        "Return true if we're using primary selection", "");
+    
 
     DocDeclStr(
         static wxClipboard *, Get(),
         "Returns global instance (wxTheClipboard) of the object.", "");
-    
+
 };
 
 
@@ -142,7 +150,8 @@ normal clipboard, if primary is True.", "");
             self._instance = None
         def _checkInstance(self):
             if self._instance is None:
-                self._instance = self._initfunc(*self._args, **self._kwargs)        
+                if wx.GetApp():
+                    self._instance = self._initfunc(*self._args, **self._kwargs)        
         def __getattr__(self, name):
             self._checkInstance()
             return getattr(self._instance, name)