fix a few hundreds of harmless unused parameters warnings and a couple of real bugs...

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

diff --git a/include/wx/mac/carbon/dnd.h b/include/wx/mac/carbon/dnd.h
index 989a977628d4b8b81abf051c82f27e3f376dabb0..946be102cb928556975a2a12401c025bd34762e4 100644 (file)
--- a/include/wx/mac/carbon/dnd.h
+++ b/include/wx/mac/carbon/dnd.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dnd.h
+// Name:        wx/mac/carbon/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$


@@ -10,10 +10,6 @@
 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 
 #ifndef _WX_DND_H_
 #define _WX_DND_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dnd.h"
-#endif
-

 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/defs.h"
 #if wxUSE_DRAG_AND_DROP
 
 #include "wx/defs.h"


@@ -27,13 +23,13 @@
 // classes
 //-------------------------------------------------------------------------
 
 // classes
 //-------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 

-class WXDLLEXPORT wxDropTarget;
-class WXDLLEXPORT wxTextDropTarget;
-class WXDLLEXPORT wxFileDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxTextDropTarget;
+class WXDLLIMPEXP_FWD_CORE wxFileDropTarget;

 
 

-class WXDLLEXPORT wxDropSource;
+class WXDLLIMPEXP_FWD_CORE wxDropSource;

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -59,7 +55,7 @@ class WXDLLEXPORT 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();

-    
+

     bool CurrentDragHasSupportedFormat() ;
     void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
     void* GetCurrentDrag() { return m_currentDrag ; }
     bool CurrentDragHasSupportedFormat() ;
     void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
     void* GetCurrentDrag() { return m_currentDrag ; }


@@ -90,7 +86,7 @@ public:
                  const wxCursor &cursorMove = wxNullCursor,
                  const wxCursor &cursorStop = wxNullCursor);
 
                  const wxCursor &cursorMove = wxNullCursor,
                  const wxCursor &cursorStop = wxNullCursor);
 

-    ~wxDropSource();
+    virtual ~wxDropSource();

 
     // do it (call this in response to a mouse button press, for example)
     // params: if bAllowMove is false, data can be only copied
 
     // do it (call this in response to a mouse button press, for example)
     // params: if bAllowMove is false, data can be only copied


@@ -99,16 +95,14 @@ public:
     wxWindow*     GetWindow() { return m_window ; }
     void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
     void* GetCurrentDrag() { return m_currentDrag ; }
     wxWindow*     GetWindow() { return m_window ; }
     void SetCurrentDrag( void* drag ) { m_currentDrag = drag ; }
     void* GetCurrentDrag() { return m_currentDrag ; }

-       bool                    MacInstallDefaultCursor(wxDragResult effect) ;
+    bool MacInstallDefaultCursor(wxDragResult effect) ;

   protected :
   protected :

-       
+

     wxWindow        *m_window;
     void* m_currentDrag ;
 };
 
     wxWindow        *m_window;
     void* m_currentDrag ;
 };
 

-#endif
-      // D&D
-
-#endif  
-       //_WX_DND_H_
+#endif // wxUSE_DRAG_AND_DROP

 
 

+#endif
+   //_WX_DND_H_