move the include of collpane.h to the main header

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

diff --git a/wxPython/src/_clipbrd.i b/wxPython/src/_clipbrd.i
index 1c262b38884f324ae074584eef6fa4f717fa1a62..b11ac31e969c67a3511de6c035d99b8eb3bce63e 100644 (file)
--- 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 ),
     
     DocDeclStr(
         virtual bool , AddData( wxDataObject *data ),


@@ -84,8 +84,8 @@ do not delete the data explicitly.
 
 :see: `wx.DataObject`", "");
     
 
 :see: `wx.DataObject`", "");
     

-
-    %clear wxDataObject *data;
+    %cleardisown( wxDataObject *data );
+    

     
     DocDeclStr(
         virtual bool , IsSupported( const wxDataFormat& format ),
     
     DocDeclStr(
         virtual bool , IsSupported( const wxDataFormat& format ),


@@ -122,6 +122,8 @@ normal clipboard, if primary is True.", "");
     DocDeclStr(
         static wxClipboard *, Get(),
         "Returns global instance (wxTheClipboard) of the object.", "");
     DocDeclStr(
         static wxClipboard *, Get(),
         "Returns global instance (wxTheClipboard) of the object.", "");

+
+    %property(Data, GetData, SetData, doc="See `GetData` and `SetData`");

     
 };
 
     
 };
 


@@ -142,7 +144,8 @@ normal clipboard, if primary is True.", "");
             self._instance = None
         def _checkInstance(self):
             if self._instance is None:
             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)
         def __getattr__(self, name):
             self._checkInstance()
             return getattr(self._instance, name)