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 ee95777c01ce6bee929f7258e7a710504a6a6d2b..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_
 
 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "dnd.h"
 #endif
 
 #pragma interface "dnd.h"
 #endif
 


@@ -91,7 +91,7 @@ public:
     ~wxDropSource();
 
     /* start drag action */
     ~wxDropSource();
 
     /* start drag action */

-    virtual wxDragResult DoDragDrop( bool bAllowMove = FALSE );
+    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);

     
     wxWindow*     GetWindow() { return m_window ; }
     void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
     
     wxWindow*     GetWindow() { return m_window ; }
     void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }