Fix crash when editing wxDVC items in place in wxOSX/Cocoa.

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

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 43c418f6ce10f556f453f90fc6980aa7434b98b6..ac3c9c4f8439188fe668e3ceeea491552e1d1a97 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -63,7 +63,7 @@ public:
         : m_cursorCopy(cursorCopy),
           m_cursorMove(cursorMove),
           m_cursorStop(cursorStop)
         : m_cursorCopy(cursorCopy),
           m_cursorMove(cursorMove),
           m_cursorStop(cursorStop)

-        { m_data = (wxDataObject *)NULL; }
+        { m_data = NULL; }

     virtual ~wxDropSourceBase() { }
 
     // set the data which is transfered by drag and drop
     virtual ~wxDropSourceBase() { }
 
     // set the data which is transfered by drag and drop


@@ -115,7 +115,7 @@ protected:
              m_cursorMove,
              m_cursorStop;
 
              m_cursorMove,
              m_cursorStop;
 

-    DECLARE_NO_COPY_CLASS(wxDropSourceBase)
+    wxDECLARE_NO_COPY_CLASS(wxDropSourceBase);

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


@@ -135,7 +135,7 @@ public:
     // ctor takes a pointer to heap-allocated wxDataObject which will be owned
     // by wxDropTarget and deleted by it automatically. If you don't give it
     // here, you can use SetDataObject() later.
     // ctor takes a pointer to heap-allocated wxDataObject which will be owned
     // by wxDropTarget and deleted by it automatically. If you don't give it
     // here, you can use SetDataObject() later.

-    wxDropTargetBase(wxDataObject *dataObject = (wxDataObject*)NULL)
+    wxDropTargetBase(wxDataObject *dataObject = NULL)

         { m_dataObject = dataObject; m_defaultAction = wxDragNone; }
     // dtor deletes our data object
     virtual ~wxDropTargetBase()
         { m_dataObject = dataObject; m_defaultAction = wxDragNone; }
     // dtor deletes our data object
     virtual ~wxDropTargetBase()


@@ -203,7 +203,7 @@ protected:
     wxDataObject *m_dataObject;
     wxDragResult m_defaultAction;
 
     wxDataObject *m_dataObject;
     wxDragResult m_defaultAction;
 

-    DECLARE_NO_COPY_CLASS(wxDropTargetBase)
+    wxDECLARE_NO_COPY_CLASS(wxDropTargetBase);

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


@@ -222,7 +222,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/dnd.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/dnd.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/dnd.h"
+    #include "wx/osx/dnd.h"

 #elif defined(__WXPM__)
     #include "wx/os2/dnd.h"
 #endif
 #elif defined(__WXPM__)
     #include "wx/os2/dnd.h"
 #endif


@@ -243,7 +243,7 @@ public:
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
 
 private:
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
 
 private:

-    DECLARE_NO_COPY_CLASS(wxTextDropTarget)
+    wxDECLARE_NO_COPY_CLASS(wxTextDropTarget);

 };
 
 // A drop target which accepts files (dragged from File Manager or Explorer)
 };
 
 // A drop target which accepts files (dragged from File Manager or Explorer)


@@ -259,7 +259,7 @@ public:
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
 
 private:
     virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
 
 private:

-    DECLARE_NO_COPY_CLASS(wxFileDropTarget)
+    wxDECLARE_NO_COPY_CLASS(wxFileDropTarget);

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