Update to Scintilla 1.48

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

diff --git a/include/wx/mac/dnd.h b/include/wx/mac/dnd.h
index 746dc91a259e0500096af2521bfddb6e2f3b65b8..e77bb0025aa20df50d407e6138dbed7adeb8bf64 100644 (file)
--- a/include/wx/mac/dnd.h
+++ b/include/wx/mac/dnd.h
@@ -10,7 +10,7 @@
 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "dnd.h"
 #endif
 
@@ -61,10 +61,10 @@ class WXDLLEXPORT wxDropTarget: public wxDropTargetBase
     virtual bool GetData();
     
     bool CurrentDragHasSupportedFormat() ;
-    void SetCurrentDrag( DragReference drag ) { m_currentDrag = drag ; }
-    DragReference GetCurrentDrag() { return m_currentDrag ; }
+    void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
+    void* GetCurrentDrag() { return m_currentDrag ; }
   protected :
-    DragReference m_currentDrag ;
+    void* m_currentDrag ;
 };
 
 //-------------------------------------------------------------------------
@@ -91,14 +91,14 @@ public:
     ~wxDropSource();
 
     /* start drag action */
-    virtual wxDragResult DoDragDrop( bool bAllowMove = FALSE );
+    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
     
     wxWindow*     GetWindow() { return m_window ; }
-    void SetCurrentDrag( DragReference drag ) { m_currentDrag = drag ; }
-    DragReference GetCurrentDrag() { return m_currentDrag ; }
+    void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
+    void* GetCurrentDrag() { return m_currentDrag ; }
   protected :
     wxWindow        *m_window;
-    DragReference m_currentDrag ;
+    void* m_currentDrag ;
 };
 
 #endif