applied patch to build wxMSW with CW7 (patch 550445)

[wxWidgets.git] / src / os2 / dnd.cpp

diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp
index 6a54e5a39c55d5161fa5d51b3d367b668ae2b8c9..463d738fa9a1851a86d400468649544e02a16968 100644 (file)
--- a/src/os2/dnd.cpp
+++ b/src/os2/dnd.cpp
@@ -14,12 +14,15 @@
 #endif
 
 #define INCL_PM
+#define INCL_DOS
 #include <os2.h>
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/dnd.h"
 
+#if wxUSE_DRAG_AND_DROP
+
 // ----------------------------------------------------------------------------
 // global
 // ----------------------------------------------------------------------------
@@ -72,13 +75,14 @@ bool wxDropTarget::OnDrop(
     return FALSE;
 };
 
-bool wxDropTarget::OnData(
+wxDragResult wxDropTarget::OnData(
   wxCoord                           x
 , wxCoord                           y
+, wxDragResult                      vResult
 )
 {
     //TODO:
-    return FALSE;
+    return (wxDragResult)0;
 };
 
 bool wxDropTarget::GetData()
@@ -95,52 +99,6 @@ bool wxDropTarget::IsAcceptable(
     return FALSE;
 };
 
-// ----------------------------------------------------------------------------
-// wxTextDropTarget
-// ----------------------------------------------------------------------------
-
-wxTextDropTarget::wxTextDropTarget()
-{
-    // TODO:
-}
-
-wxTextDropTarget::~wxTextDropTarget()
-{
-    // TODO:
-}
-
-bool wxTextDropTarget::OnData(
-  wxCoord                           x
-, wxCoord                           y
-)
-{
-    // TODO:
-    return FALSE;
-};
-
-// ----------------------------------------------------------------------------
-// wxFileDropTarget
-// ----------------------------------------------------------------------------
-
-wxFileDropTarget::wxFileDropTarget()
-{
-    // TODO:
-}
-
-wxFileDropTarget::~wxFileDropTarget()
-{
-    // TODO:
-}
-
-bool wxFileDropTarget::OnData(
-  wxCoord                           x
-, wxCoord                           y
-)
-{
-    // TODO:
-    return FALSE;
-};
-
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------
@@ -166,7 +124,7 @@ wxDropSource::~wxDropSource()
 };
 
 wxDragResult wxDropSource::DoDragDrop(
-  bool                              WXUNUSED(bAllowMove)
+  int                              WXUNUSED(flags)
 )
 {
     // TODO
@@ -178,3 +136,4 @@ void wxDropSource::Init()
     // TODO
 };
 
+#endif //wxUSE_DRAG_AND_DROP