Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / osx / dnd.h

diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h
index dea6815a45f01cebbc4888547bc556f05f5b8f6b..982e41b21903efc068c2f91a5c62f0d1091e466a 100644 (file)
--- 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$
 // 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();
     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() ;
 
     bool CurrentDragHasSupportedFormat() ;

-    void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
-    void* GetCurrentDrag() { return m_currentDrag ; }
+    void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; }

   protected :
   protected :

-    void* m_currentDrag ;
+    void* m_currentDragPasteboard ;

 };
 
 //-------------------------------------------------------------------------
 };
 
 //-------------------------------------------------------------------------


@@ -93,13 +94,13 @@ public:
     virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
 
     wxWindow*     GetWindow() { return m_window ; }
     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) ;
     bool MacInstallDefaultCursor(wxDragResult effect) ;

+    static wxDropSource* GetCurrentDropSource();

   protected :
 
     wxWindow        *m_window;
   protected :
 
     wxWindow        *m_window;

-    void* m_currentDrag ;
+    void* m_currentDragPasteboard ;

 };
 
 #endif // wxUSE_DRAG_AND_DROP
 };
 
 #endif // wxUSE_DRAG_AND_DROP