second merge of the 2.2 branch (RL)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions
--- a/wxPython/src/msw/clip_dnd.py
+++ b/wxPython/src/msw/clip_dnd.py
@@ -219,6 +219,9 @@ class wxFileDataObjectPtr(wxDataObjectSimplePtr):
    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):