Updates for recent changes to wx, and some other little tweaks and fixes.

[wxWidgets.git] / wxPython / src / msw / clip_dnd.py

diff --git a/wxPython/src/msw/clip_dnd.py b/wxPython/src/msw/clip_dnd.py
index 8be9ceb3a46ef2bec8011a031eac748cbc1c1cd4..7638de0a1dde7830a3424879c6f41335ab452dba 100644 (file)
--- a/wxPython/src/msw/clip_dnd.py
+++ b/wxPython/src/msw/clip_dnd.py
@@ -100,8 +100,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 +109,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 +159,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 +168,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 +198,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 +207,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)
 
 
 
@@ -258,7 +258,27 @@ class wxCustomDataObject(wxCustomDataObjectPtr):
 
 
 
-class wxClipboardPtr :
+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
         self.thisown = 0
@@ -308,8 +328,8 @@ 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)
+    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 :
@@ -336,7 +356,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)
 
 
 
@@ -358,8 +378,8 @@ 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)
+    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 :
@@ -394,7 +414,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)
 
 
 
@@ -403,8 +423,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)
@@ -427,7 +447,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)
 
 
 
@@ -436,8 +456,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)
@@ -460,7 +480,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)
 
 
 
@@ -506,4 +526,5 @@ wxDragError = clip_dndc.wxDragError
 wxDragNone = clip_dndc.wxDragNone
 wxDragCopy = clip_dndc.wxDragCopy
 wxDragMove = clip_dndc.wxDragMove
+wxDragLink = clip_dndc.wxDragLink
 wxDragCancel = clip_dndc.wxDragCancel