wxUniversal 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 3e9416a13dc6c7ab4dd08e8eb45330345a24f85c..33c10e58993ab64d77a6d02ce22c54babc3600a5 100644 (file)
--- a/wxPython/src/msw/clip_dnd.py
+++ b/wxPython/src/msw/clip_dnd.py
@@ -4,6 +4,8 @@ import clip_dndc
 from misc import *
 
 from gdi import *
 from misc import *
 
 from gdi import *

+
+from fonts import *

 import wx
 class wxDataFormatPtr :
     def __init__(self,this):
 import wx
 class wxDataFormatPtr :
     def __init__(self,this):


@@ -100,8 +102,8 @@ class wxPyDataObjectSimplePtr(wxDataObjectSimplePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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,)
         return val
     def __repr__(self):
         return "<C wxPyDataObjectSimple instance at %s>" % (self.this,)


@@ -109,7 +111,7 @@ class wxPyDataObjectSimple(wxPyDataObjectSimplePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxPyDataObjectSimple,_args,_kwargs)
         self.thisown = 1
     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 +161,8 @@ class wxPyTextDataObjectPtr(wxTextDataObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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,)
         return val
     def __repr__(self):
         return "<C wxPyTextDataObject instance at %s>" % (self.this,)


@@ -168,7 +170,7 @@ class wxPyTextDataObject(wxPyTextDataObjectPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxPyTextDataObject,_args,_kwargs)
         self.thisown = 1
     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 +200,8 @@ class wxPyBitmapDataObjectPtr(wxBitmapDataObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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,)
         return val
     def __repr__(self):
         return "<C wxPyBitmapDataObject instance at %s>" % (self.this,)


@@ -207,7 +209,7 @@ class wxPyBitmapDataObject(wxPyBitmapDataObjectPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxPyBitmapDataObject,_args,_kwargs)
         self.thisown = 1
     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)

 
 
 
 
 
 


@@ -219,6 +221,9 @@ class wxFileDataObjectPtr(wxDataObjectSimplePtr):
     def GetFilenames(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxFileDataObject_GetFilenames,(self,) + _args, _kwargs)
         return val
     def GetFilenames(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxFileDataObject_GetFilenames,(self,) + _args, _kwargs)
         return val

+    def AddFile(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxFileDataObject_AddFile,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxFileDataObject instance at %s>" % (self.this,)
 class wxFileDataObject(wxFileDataObjectPtr):
     def __repr__(self):
         return "<C wxFileDataObject instance at %s>" % (self.this,)
 class wxFileDataObject(wxFileDataObjectPtr):


@@ -255,7 +260,47 @@ 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 wxMetafileDataObjectPtr(wxDataObjectSimplePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetMetafile(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxMetafileDataObject_SetMetafile,(self,) + _args, _kwargs)
+        return val
+    def GetMetafile(self, *_args, **_kwargs):
+        val = apply(clip_dndc.wxMetafileDataObject_GetMetafile,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxMetafileDataObject instance at %s>" % (self.this,)
+class wxMetafileDataObject(wxMetafileDataObjectPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(clip_dndc.new_wxMetafileDataObject,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxClipboardPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -305,8 +350,8 @@ class wxDropSourcePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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 :
         return val
     def __del__(self,clip_dndc=clip_dndc):
         if self.thisown == 1 :


@@ -333,7 +378,7 @@ class wxDropSource(wxDropSourcePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxDropSource,_args,_kwargs)
         self.thisown = 1
     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,8 +400,8 @@ class wxPyDropTargetPtr(wxDropTargetPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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 :
         return val
     def __del__(self,clip_dndc=clip_dndc):
         if self.thisown == 1 :


@@ -391,7 +436,7 @@ class wxPyDropTarget(wxPyDropTargetPtr):
         self.this = apply(clip_dndc.new_wxPyDropTarget,_args,_kwargs)
         self.thisown = 1
         if _args:_args[0].thisown = 0
         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 +445,8 @@ class wxTextDropTargetPtr(wxPyDropTargetPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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)
         return val
     def base_OnEnter(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxTextDropTarget_base_OnEnter,(self,) + _args, _kwargs)


@@ -424,7 +469,7 @@ class wxTextDropTarget(wxTextDropTargetPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxTextDropTarget,_args,_kwargs)
         self.thisown = 1
     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 +478,8 @@ class wxFileDropTargetPtr(wxPyDropTargetPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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)
         return val
     def base_OnEnter(self, *_args, **_kwargs):
         val = apply(clip_dndc.wxFileDropTarget_base_OnEnter,(self,) + _args, _kwargs)


@@ -457,7 +502,7 @@ class wxFileDropTarget(wxFileDropTargetPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(clip_dndc.new_wxFileDropTarget,_args,_kwargs)
         self.thisown = 1
     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,6 +540,7 @@ 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_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)
 wxDF_MAX = clip_dndc.wxDF_MAX
 cvar = clip_dndc.cvar
 wxFormatInvalid = wxDataFormatPtr(clip_dndc.cvar.wxFormatInvalid)


@@ -503,4 +549,5 @@ wxDragError = clip_dndc.wxDragError
 wxDragNone = clip_dndc.wxDragNone
 wxDragCopy = clip_dndc.wxDragCopy
 wxDragMove = clip_dndc.wxDragMove
 wxDragNone = clip_dndc.wxDragNone
 wxDragCopy = clip_dndc.wxDragCopy
 wxDragMove = clip_dndc.wxDragMove

+wxDragLink = clip_dndc.wxDragLink

 wxDragCancel = clip_dndc.wxDragCancel
 wxDragCancel = clip_dndc.wxDragCancel