compilation fixes - wxGTK compiles but not links

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

diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp
index 5674c3659cf94177ae270bcbf16e91a7d7eb1d11..70d916d6528af2565d4fcb688aec4e35a6d76a2a 100644 (file)
--- a/src/os2/dnd.cpp
+++ b/src/os2/dnd.cpp
@@ -13,10 +13,15 @@
 #pragma implementation "dnd.h"
 #endif
 
 #pragma implementation "dnd.h"
 #endif
 

-#include "wx/dnd.h"
+#define INCL_PM
+#define INCL_DOS
+#include <os2.h>

 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/window.h"
 #include "wx/app.h"
 #include "wx/gdicmn.h"

+#include "wx/dnd.h"
+
+#if wxUSE_DRAG_AND_DROP

 
 // ----------------------------------------------------------------------------
 // global
 
 // ----------------------------------------------------------------------------
 // global


@@ -70,13 +75,14 @@ bool wxDropTarget::OnDrop(
     return FALSE;
 };
 
     return FALSE;
 };
 

-bool wxDropTarget::OnData(
+wxDragResult wxDropTarget::OnData(

   wxCoord                           x
 , wxCoord                           y
   wxCoord                           x
 , wxCoord                           y

+, wxDragResult                      vResult

 )
 {
     //TODO:
 )
 {
     //TODO:

-    return FALSE;
+    return (wxDragResult)0;

 };
 
 bool wxDropTarget::GetData()
 };
 
 bool wxDropTarget::GetData()


@@ -93,52 +99,6 @@ bool wxDropTarget::IsAcceptable(
     return FALSE;
 };
 
     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
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 // wxDropSource
 //-------------------------------------------------------------------------


@@ -176,3 +136,4 @@ void wxDropSource::Init()
     // TODO
 };
 
     // TODO
 };
 

+#endif //wxUSE_DRAG_AND_DROP