X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6762286db6cf974817dead5b88bebf0e390dbb7e..3678169caab0f713415414dce013a638305f3cce:/include/wx/osx/dnd.h diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h index 2f0b8d48ef..982e41b219 100644 --- a/include/wx/osx/dnd.h +++ b/include/wx/osx/dnd.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/dnd.h +// Name: wx/osx/dnd.h // Purpose: Declaration of the wxDropTarget, wxDropSource class etc. // Author: Stefan Csomor // RCS-ID: $Id$ @@ -49,18 +49,19 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase { public: - wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL ); + wxDropTarget(wxDataObject *dataObject = NULL ); virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def); virtual bool OnDrop(wxCoord x, wxCoord y); virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); virtual bool GetData(); + // NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement. + virtual wxDataFormat GetMatchingPair(); bool CurrentDragHasSupportedFormat() ; - void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; } - void* GetCurrentDrag() { return m_currentDrag ; } + void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; } protected : - void* m_currentDrag ; + void* m_currentDragPasteboard ; }; //------------------------------------------------------------------------- @@ -74,7 +75,7 @@ public: // // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK // compatibility, as well as both icon parameters - wxDropSource( wxWindow *win = (wxWindow *)NULL, + wxDropSource( wxWindow *win = NULL, const wxCursor &cursorCopy = wxNullCursor, const wxCursor &cursorMove = wxNullCursor, const wxCursor &cursorStop = wxNullCursor); @@ -93,13 +94,13 @@ public: virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); wxWindow* GetWindow() { return m_window ; } - void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; } - void* GetCurrentDrag() { return m_currentDrag ; } + void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; } bool MacInstallDefaultCursor(wxDragResult effect) ; + static wxDropSource* GetCurrentDropSource(); protected : wxWindow *m_window; - void* m_currentDrag ; + void* m_currentDragPasteboard ; }; #endif // wxUSE_DRAG_AND_DROP