Fixed unicode reference file writing under some builds.

[wxWidgets.git] / wxPython / src / _dnd.i

diff --git a/wxPython/src/_dnd.i b/wxPython/src/_dnd.i
index 4e59285844a28d551dfe2633fed9b83e0478b364..01a908c0319b0e496c0a967e5ab17b7a56beb4a9 100644 (file)
--- a/wxPython/src/_dnd.i
+++ b/wxPython/src/_dnd.i
@@ -55,8 +55,10 @@ IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback);
 %}
 
 
-%name(DropSource) class wxPyDropSource {
+%rename(DropSource) wxPyDropSource;
+class wxPyDropSource {
 public:
+    %pythonAppend wxPyDropSource "self._setCallbackInfo(self, DropSource, 0)"
 #ifndef __WXGTK__
      wxPyDropSource(wxWindow *win,
                     const wxCursor &copy = wxNullCursor,
@@ -70,23 +72,38 @@ public:
 #endif
 
     void _setCallbackInfo(PyObject* self, PyObject* _class, int incref);
-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxDropSource, 0)"
     ~wxPyDropSource();
 
     // set the data which is transfered by drag and drop
     void SetData(wxDataObject& data);
-    
+
     wxDataObject *GetDataObject();
-    
+
     // set the icon corresponding to given drag result
     void SetCursor(wxDragResult res, const wxCursor& cursor);
 
     wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
 
-    bool base_GiveFeedback(wxDragResult effect);
+    bool GiveFeedback(wxDragResult effect);
+    %MAKE_BASE_FUNC(DropSource, GiveFeedback);
 };
 
 
+%pythoncode {
+def DROP_ICON(filename):
+    """
+    Returns either a `wx.Cursor` or `wx.Icon` created from the image file
+    ``filename``.  This function is useful with the `wx.DropSource` class
+    which, depending on platform accepts either a icon or a cursor.
+    """
+    img = wx.Image(filename)
+    if wx.Platform == '__WXGTK__':
+        return wx.IconFromBitmap(wx.BitmapFromImage(img))
+    else:
+        return wx.CursorFromImage(img)
+}
+
+
 //---------------------------------------------------------------------------
 
 // wxDropTarget should be associated with a window if it wants to be able to
@@ -115,12 +132,14 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyDropTarget, wxDropTarget, OnDrop);
 %}
 
 
-%name(DropTarget) class wxPyDropTarget // : public wxDropTarget
+%rename(DropTarget) wxPyDropTarget;
+class wxPyDropTarget // : public wxDropTarget
 {
 public:
-    %addtofunc wxPyDropTarget
-       "if args: args[0].thisown = 0;
-        self._setCallbackInfo(self, DropTarget)"
+    %pythonAppend wxPyDropTarget
+       "self._setCallbackInfo(self, DropTarget)"
+
+    %disownarg( wxDataObject *dataObject );
 
     wxPyDropTarget(wxDataObject *dataObject = NULL);
     void _setCallbackInfo(PyObject* self, PyObject* _class);
@@ -129,18 +148,34 @@ public:
 
     // get/set the associated wxDataObject
     wxDataObject *GetDataObject();
-    %addtofunc SetDataObject "args[1].thisown = 0"
     void SetDataObject(wxDataObject *dataObject);
 
-    wxDragResult base_OnEnter(wxCoord x, wxCoord y, wxDragResult def);
-    wxDragResult base_OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    void base_OnLeave();
-    bool base_OnDrop(wxCoord x, wxCoord y);
+    %cleardisown( wxDataObject *dataObject );
+
+    wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
+    wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
+    void OnLeave();
+    bool OnDrop(wxCoord x, wxCoord y);
+
+    %MAKE_BASE_FUNC(DropTarget, OnEnter);
+    %MAKE_BASE_FUNC(DropTarget, OnDragOver);
+    %MAKE_BASE_FUNC(DropTarget, OnLeave);
+    %MAKE_BASE_FUNC(DropTarget, OnDrop);
 
+    
     // may be called *only* from inside OnData() and will fill m_dataObject
     // with the data from the drop source if it returns True
     bool GetData();
 
+    // sets the default action for drag and drop:
+    // use wxDragMove or wxDragCopy to set deafult action to move or copy
+    // and use wxDragNone (default) to set default action specified by
+    // initialization of draging (see wxDropSourceBase::DoDragDrop())
+    void SetDefaultAction(wxDragResult action);
+
+    // returns default action for drag and drop or
+    // wxDragNone if this not specified
+    wxDragResult GetDefaultAction();
 };
 
 
@@ -177,19 +212,27 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyTextDropTarget, wxTextDropTarget, OnDrop);
 
 %}
 
-%name(TextDropTarget) class wxPyTextDropTarget : public wxPyDropTarget {
+%rename(TextDropTarget) wxPyTextDropTarget;
+class wxPyTextDropTarget : public wxPyDropTarget {
 public:
-    %addtofunc wxPyTextDropTarget   "self._setCallbackInfo(self, TextDropTarget)"
+    %pythonAppend wxPyTextDropTarget   "self._setCallbackInfo(self, TextDropTarget)"
 
     wxPyTextDropTarget();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
-    //bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;
-    wxDragResult base_OnEnter(wxCoord x, wxCoord y, wxDragResult def);
-    wxDragResult base_OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    void base_OnLeave();
-    bool base_OnDrop(wxCoord x, wxCoord y);
-    wxDragResult base_OnData(wxCoord x, wxCoord y, wxDragResult def);
+    bool OnDropText(wxCoord x, wxCoord y, const wxString& text);
+    wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
+    wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
+    void OnLeave();
+    bool OnDrop(wxCoord x, wxCoord y);
+    wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
+
+    %MAKE_BASE_FUNC(TextDropTarget, OnDropText);
+    %MAKE_BASE_FUNC(TextDropTarget, OnEnter);
+    %MAKE_BASE_FUNC(TextDropTarget, OnDragOver);
+    %MAKE_BASE_FUNC(TextDropTarget, OnLeave);
+    %MAKE_BASE_FUNC(TextDropTarget, OnDrop);
+    %MAKE_BASE_FUNC(TextDropTarget, OnData);    
 };
 
 //---------------------------------------------------------------------------
@@ -215,14 +258,14 @@ public:
 
 bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y,
                                      const wxArrayString& filenames) {
-    bool rval = False;
-    wxPyBeginBlockThreads();
+    bool rval = false;
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "OnDropFiles")) {
         PyObject* list = wxArrayString2PyList_helper(filenames);
         rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",x,y,list));
         Py_DECREF(list);
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return rval;
 }
 
@@ -237,20 +280,28 @@ IMP_PYCALLBACK_BOOL_INTINT(wxPyFileDropTarget, wxFileDropTarget, OnDrop);
 %}
 
 
-%name(FileDropTarget) class wxPyFileDropTarget : public wxPyDropTarget
+%rename(FileDropTarget) wxPyFileDropTarget;
+class wxPyFileDropTarget : public wxPyDropTarget
 {
 public:
-    %addtofunc wxPyFileDropTarget   "self._setCallbackInfo(self, FileDropTarget)"
+    %pythonAppend wxPyFileDropTarget   "self._setCallbackInfo(self, FileDropTarget)"
 
     wxPyFileDropTarget();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
-//    bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames) = 0;
-    wxDragResult base_OnEnter(wxCoord x, wxCoord y, wxDragResult def);
-    wxDragResult base_OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    void base_OnLeave();
-    bool base_OnDrop(wxCoord x, wxCoord y);
-    wxDragResult base_OnData(wxCoord x, wxCoord y, wxDragResult def);
+    bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames);
+    wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
+    wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
+    void OnLeave();
+    bool OnDrop(wxCoord x, wxCoord y);
+    wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
+    
+    %MAKE_BASE_FUNC(FileDropTarget, OnDropFiles);
+    %MAKE_BASE_FUNC(FileDropTarget, OnEnter);
+    %MAKE_BASE_FUNC(FileDropTarget, OnDragOver);
+    %MAKE_BASE_FUNC(FileDropTarget, OnLeave);
+    %MAKE_BASE_FUNC(FileDropTarget, OnDrop);
+    %MAKE_BASE_FUNC(FileDropTarget, OnData);    
 };