Don't call StartingKey if the key was F2

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

diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp
index a8dc2ed31595e5464e0ed393f2b85448ae06f1cc..02cbfdd23fa9447b571bc98837c71e56877d0032 100644 (file)
--- a/src/os2/dnd.cpp
+++ b/src/os2/dnd.cpp
@@ -32,6 +32,7 @@
 // Private functions
 /////////////////////////////////////////////////////////////////////////////
 
 // Private functions
 /////////////////////////////////////////////////////////////////////////////
 

+#if 0

 static wxDragResult ConvertDragEffectToResult (
   DWORD                             dwEffect
 )
 static wxDragResult ConvertDragEffectToResult (
   DWORD                             dwEffect
 )


@@ -73,6 +74,7 @@ static DWORD ConvertDragResultToEffect (
             return DO_DEFAULT;
     }
 } // end of ConvertDragResultToEffect
             return DO_DEFAULT;
     }
 } // end of ConvertDragResultToEffect

+#endif

 
 class CIDropTarget
 {
 
 class CIDropTarget
 {


@@ -125,7 +127,7 @@ MRESULT CIDropTarget::DragOver ()
 {
     char                            zBuffer[128];
     ULONG                           ulBytes;
 {
     char                            zBuffer[128];
     ULONG                           ulBytes;

-    USHORT                          uOp;
+    USHORT                          uOp = 0;

     USHORT                          uIndicator;
     ULONG                           ulItems;
     ULONG                           i;
     USHORT                          uIndicator;
     ULONG                           ulItems;
     ULONG                           i;


@@ -195,7 +197,7 @@ MRESULT CIDropTarget::Drop ()
 {
     char                            zBuffer[128];
     ULONG                           ulBytes;
 {
     char                            zBuffer[128];
     ULONG                           ulBytes;

-    USHORT                          uOp;
+    USHORT                          uOp = 0;

     USHORT                          uIndicator;
     ULONG                           ulItems;
     ULONG                           i;
     USHORT                          uIndicator;
     ULONG                           ulItems;
     ULONG                           i;


@@ -248,7 +250,7 @@ MRESULT CIDropTarget::Drop ()
                           ,m_pDragInfo->yDrop
                          ))
     {
                           ,m_pDragInfo->yDrop
                          ))
     {

-        wxDragResult                 eRc;
+        wxDragResult                 eRc = wxDragNone;;

 
         //
         // And now it has the data
 
         //
         // And now it has the data


@@ -517,6 +519,11 @@ bool wxDropSource::GiveFeedback (
             case wxDragLink:
                 m_pDragInfo->usOperation = DO_LINK;
                 break;
             case wxDragLink:
                 m_pDragInfo->usOperation = DO_LINK;
                 break;

+
+            case wxDragNone:
+            case wxDragCancel:
+            case wxDragError:
+                break;

         }
         return TRUE;
     }
         }
         return TRUE;
     }