X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f54a35fe2206fa815f0a77bd13d04d37a3895e72..53663be8a5ea8e1c6f178839209b67e8228e4642:/wxPython/src/msw/clip_dnd.py

diff --git a/wxPython/src/msw/clip_dnd.py b/wxPython/src/msw/clip_dnd.py
index e453c1a015..fd3400e661 100644
--- a/wxPython/src/msw/clip_dnd.py
+++ b/wxPython/src/msw/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
@@ -351,9 +359,12 @@ class wxDropSourcePtr :
     def _setCallbackInfo(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxDropSource__setCallbackInfo,(self,) + _args, _kwargs)
         return val
-    def __del__(self,clip_dndc=clip_dndc):
-        if self.thisown == 1 :
-            clip_dndc.delete_wxDropSource(self)
+    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
@@ -401,9 +412,12 @@ class wxPyDropTargetPtr(wxDropTargetPtr):
     def _setCallbackInfo(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxPyDropTarget__setCallbackInfo,(self,) + _args, _kwargs)
         return val
-    def __del__(self,clip_dndc=clip_dndc):
-        if self.thisown == 1 :
-            clip_dndc.delete_wxPyDropTarget(self)
+    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) 
@@ -538,10 +552,14 @@ 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