replace apple extended code

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

diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp
index 6a645291fcb00a8c1b1c0cb90d96a4c316ac006b..b12b6af4bbb0c3d5e4e9f1ca2c1c1038c56b97ad 100644 (file)
--- a/src/os2/dnd.cpp
+++ b/src/os2/dnd.cpp
@@ -13,14 +13,15 @@
 #pragma implementation "dnd.h"
 #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"
 
+#define INCL_PM
+#define INCL_DOS
+#include <os2.h>
+
 #if wxUSE_DRAG_AND_DROP
 
 // ----------------------------------------------------------------------------
@@ -31,6 +32,7 @@
 // Private functions
 /////////////////////////////////////////////////////////////////////////////
 
+#if 0
 static wxDragResult ConvertDragEffectToResult (
   DWORD                             dwEffect
 )
@@ -72,6 +74,7 @@ static DWORD ConvertDragResultToEffect (
             return DO_DEFAULT;
     }
 } // end of ConvertDragResultToEffect
+#endif
 
 class CIDropTarget
 {
@@ -516,6 +519,11 @@ bool wxDropSource::GiveFeedback (
             case wxDragLink:
                 m_pDragInfo->usOperation = DO_LINK;
                 break;
+
+            case wxDragNone:
+            case wxDragCancel:
+            case wxDragError:
+                break;
         }
         return TRUE;
     }
@@ -562,7 +570,7 @@ void wxDropSource::Init ()
     hStrContainer = ::DrgAddStrHandle(zContainer);
 
     m_pDragItem = new DRAGITEM[m_ulItems];
-    for (ULONG i = 0; i < m_ulItems; i++);
+    for (ULONG i = 0; i < m_ulItems; i++)
     {
         m_pDragItem[i].hwndItem          = m_pWindow->GetHWND();
         m_pDragItem[i].hstrType          = hStrType;