X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9df61a29d2ff6ec6037c04a4da6d5418c1a5fbc9..7728856b75c201016a30145673bc8a85be96fdfe:/wxPython/src/gtk/clip_dnd.py

diff --git a/wxPython/src/gtk/clip_dnd.py b/wxPython/src/gtk/clip_dnd.py
index fc43b06bd9..d77b5da68d 100644
--- a/wxPython/src/gtk/clip_dnd.py
+++ b/wxPython/src/gtk/clip_dnd.py
@@ -4,14 +4,19 @@ import clip_dndc
 from misc import *
 
 from gdi import *
+
+from fonts import *
 import wx
 class wxDataFormatPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,clip_dndc=clip_dndc):
-        if self.thisown == 1 :
-            clip_dndc.delete_wxDataFormat(self)
+    def __del__(self, delfunc=clip_dndc.delete_wxDataFormat):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetType(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxDataFormat_SetType,(self,) + _args, _kwargs)
         return val
@@ -41,9 +46,12 @@ class wxDataObjectPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,clip_dndc=clip_dndc):
-        if self.thisown == 1 :
-            clip_dndc.delete_wxDataObject(self)
+    def __del__(self, delfunc=clip_dndc.delete_wxDataObject):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetPreferredFormat(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxDataObject_GetPreferredFormat,(self,) + _args, _kwargs)
         if val: val = wxDataFormatPtr(val) ; val.thisown = 1
@@ -54,12 +62,12 @@ class wxDataObjectPtr :
     def GetAllFormats(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxDataObject_GetAllFormats,(self,) + _args, _kwargs)
         return val
-    def GetDataSize(self, *_args, **_kwargs):
-        val = apply(clip_dndc.wxDataObject_GetDataSize,(self,) + _args, _kwargs)
-        return val
     def GetDataHere(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxDataObject_GetDataHere,(self,) + _args, _kwargs)
         return val
+    def GetDataSize(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxDataObject_GetDataSize,(self,) + _args, _kwargs)
+        return val
     def SetData(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxDataObject_SetData,(self,) + _args, _kwargs)
         return val
@@ -100,8 +108,8 @@ class wxPyDataObjectSimplePtr(wxDataObjectSimplePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(clip_dndc.wxPyDataObjectSimple__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxPyDataObjectSimple__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxPyDataObjectSimple instance at %s>" % (self.this,)
@@ -109,7 +117,7 @@ class wxPyDataObjectSimple(wxPyDataObjectSimplePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxPyDataObjectSimple,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyDataObjectSimple)
+        self._setCallbackInfo(self, wxPyDataObjectSimple)
 
 
 
@@ -159,8 +167,8 @@ class wxPyTextDataObjectPtr(wxTextDataObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(clip_dndc.wxPyTextDataObject__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxPyTextDataObject__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxPyTextDataObject instance at %s>" % (self.this,)
@@ -168,7 +176,7 @@ class wxPyTextDataObject(wxPyTextDataObjectPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxPyTextDataObject,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyTextDataObject)
+        self._setCallbackInfo(self, wxPyTextDataObject)
 
 
 
@@ -198,8 +206,8 @@ class wxPyBitmapDataObjectPtr(wxBitmapDataObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(clip_dndc.wxPyBitmapDataObject__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxPyBitmapDataObject__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def __repr__(self):
         return "<C wxPyBitmapDataObject instance at %s>" % (self.this,)
@@ -207,7 +215,7 @@ class wxPyBitmapDataObject(wxPyBitmapDataObjectPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxPyBitmapDataObject,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxPyBitmapDataObject)
+        self._setCallbackInfo(self, wxPyBitmapDataObject)
 
 
 
@@ -255,6 +263,26 @@ class wxCustomDataObject(wxCustomDataObjectPtr):
 
 
 
+class wxURLDataObjectPtr(wxDataObjectCompositePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetURL(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxURLDataObject_GetURL,(self,) + _args, _kwargs)
+        return val
+    def SetURL(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxURLDataObject_SetURL,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxURLDataObject instance at %s>" % (self.this,)
+class wxURLDataObject(wxURLDataObjectPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(clip_dndc.new_wxURLDataObject,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxClipboardPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
@@ -305,12 +333,15 @@ class wxDropSourcePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(clip_dndc.wxDropSource__setSelf,(self,) + _args, _kwargs)
-        return val
-    def __del__(self,clip_dndc=clip_dndc):
-        if self.thisown == 1 :
-            clip_dndc.delete_wxDropSource(self)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxDropSource__setCallbackInfo,(self,) + _args, _kwargs)
+        return val
+    def __del__(self, delfunc=clip_dndc.delete_wxDropSource):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetData(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxDropSource_SetData,(self,) + _args, _kwargs)
         return val
@@ -333,7 +364,7 @@ class wxDropSource(wxDropSourcePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxDropSource,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxDropSource, 0)
+        self._setCallbackInfo(self, wxDropSource, 0)
 
 
 
@@ -355,12 +386,15 @@ class wxPyDropTargetPtr(wxDropTargetPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(clip_dndc.wxPyDropTarget__setSelf,(self,) + _args, _kwargs)
-        return val
-    def __del__(self,clip_dndc=clip_dndc):
-        if self.thisown == 1 :
-            clip_dndc.delete_wxPyDropTarget(self)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxPyDropTarget__setCallbackInfo,(self,) + _args, _kwargs)
+        return val
+    def __del__(self, delfunc=clip_dndc.delete_wxPyDropTarget):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetDataObject(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxPyDropTarget_GetDataObject,(self,) + _args, _kwargs)
         if val: val = wxDataObjectPtr(val) 
@@ -391,7 +425,7 @@ class wxPyDropTarget(wxPyDropTargetPtr):
         self.this = apply(clip_dndc.new_wxPyDropTarget,_args,_kwargs)
         self.thisown = 1
         if _args:_args[0].thisown = 0
-        self._setSelf(self, wxPyDropTarget)
+        self._setCallbackInfo(self, wxPyDropTarget)
 
 
 
@@ -400,8 +434,8 @@ class wxTextDropTargetPtr(wxPyDropTargetPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(clip_dndc.wxTextDropTarget__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxTextDropTarget__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def base_OnEnter(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxTextDropTarget_base_OnEnter,(self,) + _args, _kwargs)
@@ -424,7 +458,7 @@ class wxTextDropTarget(wxTextDropTargetPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxTextDropTarget,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxTextDropTarget)
+        self._setCallbackInfo(self, wxTextDropTarget)
 
 
 
@@ -433,8 +467,8 @@ class wxFileDropTargetPtr(wxPyDropTargetPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(clip_dndc.wxFileDropTarget__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxFileDropTarget__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def base_OnEnter(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxFileDropTarget_base_OnEnter,(self,) + _args, _kwargs)
@@ -457,7 +491,7 @@ class wxFileDropTarget(wxFileDropTargetPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxFileDropTarget,_args,_kwargs)
         self.thisown = 1
-        self._setSelf(self, wxFileDropTarget)
+        self._setCallbackInfo(self, wxFileDropTarget)
 
 
 
@@ -495,12 +529,17 @@ wxDF_ENHMETAFILE = clip_dndc.wxDF_ENHMETAFILE
 wxDF_FILENAME = clip_dndc.wxDF_FILENAME
 wxDF_LOCALE = clip_dndc.wxDF_LOCALE
 wxDF_PRIVATE = clip_dndc.wxDF_PRIVATE
+wxDF_HTML = clip_dndc.wxDF_HTML
 wxDF_MAX = clip_dndc.wxDF_MAX
 cvar = clip_dndc.cvar
 wxFormatInvalid = wxDataFormatPtr(clip_dndc.cvar.wxFormatInvalid)
 wxTheClipboard = wxClipboardPtr(clip_dndc.cvar.wxTheClipboard)
+wxDrag_CopyOnly = clip_dndc.wxDrag_CopyOnly
+wxDrag_AllowMove = clip_dndc.wxDrag_AllowMove
+wxDrag_DefaultMove = clip_dndc.wxDrag_DefaultMove
 wxDragError = clip_dndc.wxDragError
 wxDragNone = clip_dndc.wxDragNone
 wxDragCopy = clip_dndc.wxDragCopy
 wxDragMove = clip_dndc.wxDragMove
+wxDragLink = clip_dndc.wxDragLink
 wxDragCancel = clip_dndc.wxDragCancel