X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/osx/dnd.h diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h index dea6815a45..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$ @@ -55,12 +55,13 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase 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 ; }; //------------------------------------------------------------------------- @@ -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