safe macro expansion

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

diff --git a/include/wx/os2/dnd.h b/include/wx/os2/dnd.h
index 60efc76fe884f628d8e6bd4f0fb742c69464ab40..a92c744745095a20cae5b856ba21696a78b1670b 100644 (file)
--- a/include/wx/os2/dnd.h
+++ b/include/wx/os2/dnd.h
@@ -13,14 +13,16 @@
 #ifndef __OS2DNDH__
 #define __OS2DNDH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #if !wxUSE_DRAG_AND_DROP
     #error  "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
 #endif  //WX_DRAG_DROP
 
+#define INCL_WINSTDDRAG
+#include <os2.h>
+#ifndef __EMX__
+#include <pmstddlg.h>
+#endif
+
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
@@ -33,7 +35,7 @@ public:
 
     /* constructor for setting one data object */
     wxDropSource( wxDataObject& rData,
-                  wxWindow*     pWin,
+                  wxWindow*     pWin
                 );
     virtual ~wxDropSource();
 
@@ -64,7 +66,7 @@ public:
 
     virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
     virtual bool OnDrop(wxCoord x, wxCoord y);
-    virtual bool OnData(wxCoord x, wxCoord y);
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult vResult);
     virtual bool GetData();
 
   // implementation
@@ -75,47 +77,5 @@ protected:
     DRAGTRANSFER*                   m_pDragTransfer;
 };
 
-// ----------------------------------------------------------------------------
-// A simple wxDropTarget derived class for text data: you only need to
-// override OnDropText() to get something working
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxTextDropTarget : public wxDropTarget
-{
-public:
-    wxTextDropTarget();
-    virtual ~wxTextDropTarget();
-
-    virtual bool OnDropText( wxCoord         x
-                            ,wxCoord         y
-                            ,const wxString& rText
-                           ) = 0;
-
-    virtual bool OnData( wxCoord x
-                        ,wxCoord y
-                       );
-};
-
-// ----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxFileDropTarget : public wxDropTarget
-{
-public:
-    wxFileDropTarget();
-    virtual ~wxFileDropTarget();
-
-    // parameters are the number of files and the array of file names
-    virtual bool OnDropFiles( wxCoord              x
-                             ,wxCoord              y
-                             ,const wxArrayString& rFilenames
-                            ) = 0;
-
-    virtual bool OnData( wxCoord x
-                        ,wxCoord y
-                       );
-};
-
 #endif //__OS2DNDH__