wxCheckListBox doesn't require wxUSE_OWNER_DRAWN when using WXUNIVERSAL

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

diff --git a/wxPython/src/_dnd.i b/wxPython/src/_dnd.i
index a7f5e4ab3bfbef365e4d4901c9ce1c351d61af4c..29a4d2cc1954a5b37f36dc6d06d44b74bddeaf44 100644 (file)
--- a/wxPython/src/_dnd.i
+++ b/wxPython/src/_dnd.i
@@ -88,6 +88,21 @@ public:
 };
 
 
+%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
@@ -144,6 +159,15 @@ public:
     // 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();
 };
 
 
@@ -220,7 +244,7 @@ public:
 bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y,
                                      const wxArrayString& filenames) {
     bool rval = false;
-    bool blocked = wxPyBeginBlockThreads();
+    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));