fix (harmless for now) g++ warning about non-virtual dtor

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

diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h
index 2f0b8d48ef2e3ac9922054a3e603d4c919fd722b..dd91f63789af72ea37177f20783c7421fc34b433 100644 (file)
--- a/include/wx/osx/dnd.h
+++ b/include/wx/osx/dnd.h
@@ -49,7 +49,7 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
 {
   public:
 
 {
   public:
 

-    wxDropTarget(wxDataObject *dataObject = (wxDataObject*) NULL );
+    wxDropTarget(wxDataObject *dataObject = NULL );

 
     virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool OnDrop(wxCoord x, wxCoord y);
 
     virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool OnDrop(wxCoord x, wxCoord y);


@@ -57,10 +57,9 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
     virtual bool GetData();
 
     bool CurrentDragHasSupportedFormat() ;
     virtual bool GetData();
 
     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 ;

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


@@ -74,7 +73,7 @@ public:
     //
     // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK
     //     compatibility, as well as both icon parameters
     //
     // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK
     //     compatibility, as well as both icon parameters

-    wxDropSource( wxWindow *win = (wxWindow *)NULL,
+    wxDropSource( wxWindow *win = NULL,

                  const wxCursor &cursorCopy = wxNullCursor,
                  const wxCursor &cursorMove = wxNullCursor,
                  const wxCursor &cursorStop = wxNullCursor);
                  const wxCursor &cursorCopy = wxNullCursor,
                  const wxCursor &cursorMove = wxNullCursor,
                  const wxCursor &cursorStop = wxNullCursor);


@@ -93,13 +92,12 @@ 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) ;
   protected :
 
     wxWindow        *m_window;
     bool MacInstallDefaultCursor(wxDragResult effect) ;
   protected :
 
     wxWindow        *m_window;

-    void* m_currentDrag ;
+    void* m_currentDragPasteboard ;

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