build fixes

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

diff --git a/include/wx/x11/dnd.h b/include/wx/x11/dnd.h
index 1af3bacce2857d281e1abd3a55636c27d9926749..dc0f7da7a18d7e32266f941a506269fab4244580 100644 (file)
--- a/include/wx/x11/dnd.h
+++ b/include/wx/x11/dnd.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-

 #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
-#endif
-

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


@@ -28,14 +23,14 @@
 // classes
 //-------------------------------------------------------------------------
 
 // classes
 //-------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 

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

 
 

-class WXDLLEXPORT wxDropSource;
+class WXDLLIMPEXP_FWD_CORE wxDropSource;

 
 //-------------------------------------------------------------------------
 // wxDropTarget
 
 //-------------------------------------------------------------------------
 // wxDropTarget


@@ -46,7 +41,7 @@ class WXDLLEXPORT wxDropTarget: public wxObject
 public:
     
     wxDropTarget();
 public:
     
     wxDropTarget();

-    ~wxDropTarget();
+    virtual ~wxDropTarget();

     
     virtual void OnEnter() { }
     virtual void OnLeave() { }
     
     virtual void OnEnter() { }
     virtual void OnLeave() { }


@@ -148,7 +143,7 @@ public:
     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
     
     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
     

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

     
     void SetData( wxDataObject &data  );
     wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
     
     void SetData( wxDataObject &data  );
     wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);